Merge branch '2.3' into 2.4
This commit is contained in:
@ -12,7 +12,7 @@ include_directories(${CMAKE_BINARY_DIR}/sqlite-bld-3110100)
|
|||||||
include_directories(${MARIADB_CONNECTOR_INCLUDE_DIR})
|
include_directories(${MARIADB_CONNECTOR_INCLUDE_DIR})
|
||||||
|
|
||||||
# GCC thinks there is an array-bounds error in sqlite code.
|
# GCC thinks there is an array-bounds error in sqlite code.
|
||||||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=array-bounds")
|
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=array-bounds -Wno-misleading-indentation")
|
||||||
|
|
||||||
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)
|
||||||
|
|||||||
Reference in New Issue
Block a user