hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always build Connector-C

Browse Source 
The connector is now unconditionally build from source.
This commit is contained in:
Markus Mäkelä
2018-02-08 09:40:47 +02:00
parent b059d78a30
commit b2f17494ad
1 changed files with 3 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
CMakeLists.txt
View File

@ -33,7 +33,6 @@ include(cmake/CheckPlatform.cmake)
check_dirs() check_dirs()
find_package(OpenSSL) find_package(OpenSSL)
find_package(Valgrind) find_package(Valgrind)
find_package(MariaDBConnector)
find_package(Pandoc) find_package(Pandoc)
find_package(TCMalloc) find_package(TCMalloc)
find_package(Jemalloc) find_package(Jemalloc)
@ -51,16 +50,9 @@ include(cmake/BuildPCRE2.cmake)
include_directories(BEFORE ${PCRE2_INCLUDE_DIRS}) include_directories(BEFORE ${PCRE2_INCLUDE_DIRS})
# If the connector was not found, download and build it from source # Always build Connector-C from a known good commit
if(NOT MARIADB_CONNECTOR_FOUND) include(cmake/BuildMariaDBConnector.cmake)
message(STATUS "Building MariaDB Connector-C from source.") include_directories(BEFORE ${MARIADB_CONNECTOR_INCLUDE_DIR})
include(cmake/BuildMariaDBConnector.cmake)
include_directories(BEFORE ${MARIADB_CONNECTOR_INCLUDE_DIR})
else()
# This is required as the core depends on the `connector-c` target
add_custom_target(connector-c)
message(STATUS "Using system Connector-C")
endif()
include(cmake/BuildJansson.cmake) include(cmake/BuildJansson.cmake)
include(cmake/BuildMicroHttpd.cmake) include(cmake/BuildMicroHttpd.cmake)