MXS-2732 Rename sqlite-src-3110100 to sqlite-src-3110100.old
Originally, the sqlite installation was imported into the MaxScale repository in the one gigantic MaxScale 1.4 -> 2.0 commit. Consequently, there is no import commit to compare to if you want to extract all MaxScale specific changes. To make it simpler in the future, sqlite will now be imported in a commit of its own.
This commit is contained in:
@ -1,9 +1,9 @@
|
|||||||
include(ExternalProject)
|
include(ExternalProject)
|
||||||
|
|
||||||
ExternalProject_Add(maxscale_sqlite
|
ExternalProject_Add(maxscale_sqlite
|
||||||
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sqlite-src-3110100
|
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/sqlite-src-3110100.old
|
||||||
BINARY_DIR ${CMAKE_BINARY_DIR}/sqlite-bld-3110100
|
BINARY_DIR ${CMAKE_BINARY_DIR}/sqlite-bld-3110100
|
||||||
CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/sqlite-src-3110100/configure --with-pic --enable-maxscale
|
CONFIGURE_COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/sqlite-src-3110100.old/configure --with-pic --enable-maxscale
|
||||||
BUILD_COMMAND make sqlite3.c
|
BUILD_COMMAND make sqlite3.c
|
||||||
INSTALL_COMMAND "")
|
INSTALL_COMMAND "")
|
||||||
|
|
||||||
@ -17,7 +17,7 @@ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=array-bounds")
|
|||||||
add_library(qc_sqlite SHARED qc_sqlite.cc qc_sqlite3.c builtin_functions.c)
|
add_library(qc_sqlite SHARED qc_sqlite.cc qc_sqlite3.c builtin_functions.c)
|
||||||
add_dependencies(qc_sqlite maxscale_sqlite)
|
add_dependencies(qc_sqlite maxscale_sqlite)
|
||||||
# If you feel a need to add something here, check also the handling of 'enable_maxscale'
|
# If you feel a need to add something here, check also the handling of 'enable_maxscale'
|
||||||
# in sqlite-src-3110100/configure.
|
# in sqlite-src-3110100.old/configure.
|
||||||
# In configure we have defined SQLITE_OMIT_VIRTUALTABLE, but it cannot be defined here,
|
# In configure we have defined SQLITE_OMIT_VIRTUALTABLE, but it cannot be defined here,
|
||||||
# although conceptually is should, as one needed static function in case will be missing.
|
# although conceptually is should, as one needed static function in case will be missing.
|
||||||
add_definitions(-DMAXSCALE -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_OMIT_ATTACH -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_AUTOVACUUM -DSQLITE_OMIT_PRAGMA -DSQLITE_DEFAULT_MEMSTATUS=0)
|
add_definitions(-DMAXSCALE -DSQLITE_THREADSAFE=0 -DSQLITE_ENABLE_UPDATE_DELETE_LIMIT -DSQLITE_OMIT_ATTACH -DSQLITE_OMIT_REINDEX -DSQLITE_OMIT_AUTOVACUUM -DSQLITE_OMIT_PRAGMA -DSQLITE_DEFAULT_MEMSTATUS=0)
|
||||||
|
Before Width: | Height: | Size: 2.2 KiB After Width: | Height: | Size: 2.2 KiB |
Before Width: | Height: | Size: 79 KiB After Width: | Height: | Size: 79 KiB |
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user