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

Fixed Connector-C .cmake files

Browse Source 
The files always forced the variables to be updated which caused the library
to be built again every time.
This commit is contained in:
Markus Makela 2016-03-09 15:25:27 +02:00
parent e2588e3c95
commit 5ad11f2aac
2 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/BuildMariaDBConnector.cmake
View File

@ -20,13 +20,13 @@ ExternalProject_Add(connector-c
BINARY_DIR ${CMAKE_BINARY_DIR}/connector-c
INSTALL_DIR ${CMAKE_BINARY_DIR}/connector-c/install)
set(MARIADB_CONNECTOR_FOUND TRUE CACHE INTERNAL "" FORCE)
set(MARIADB_CONNECTOR_STATIC_FOUND TRUE CACHE INTERNAL "" FORCE)
set(MARIADB_CONNECTOR_FOUND TRUE CACHE INTERNAL "")
set(MARIADB_CONNECTOR_STATIC_FOUND TRUE CACHE INTERNAL "")
set(MARIADB_CONNECTOR_INCLUDE_DIR
${CMAKE_BINARY_DIR}/connector-c/install/include/mariadb CACHE INTERNAL "" FORCE)
${CMAKE_BINARY_DIR}/connector-c/install/include/mariadb CACHE INTERNAL "")
set(MARIADB_CONNECTOR_STATIC_LIBRARIES
${CMAKE_BINARY_DIR}/connector-c/install/lib/mariadb/libmariadbclient.a
CACHE INTERNAL "" FORCE)
CACHE INTERNAL "")
set(MARIADB_CONNECTOR_LIBRARIES
${CMAKE_BINARY_DIR}/connector-c/install/lib/mariadb/libmariadbclient.a
CACHE INTERNAL "" FORCE)
CACHE INTERNAL "")

7
cmake/FindMariaDBConnector.cmake
View File

@ -40,6 +40,11 @@ endif()
if(HAVE_MARIADB_CONNECTOR)
message(STATUS "Found MariaDB Connector-C")
set(MARIADB_CONNECTOR_FOUND TRUE CACHE INTERNAL "" FORCE)
else()
set(MARIADB_CONNECTOR_FOUND FALSE CACHE INTERNAL "" FORCE)
unset(MARIADB_CONNECTOR_FOUND)
unset(MARIADB_CONNECTOR_STATIC_FOUND)
unset(MARIADB_CONNECTOR_LIBRARIES)
unset(MARIADB_CONNECTOR_STATIC_LIBRARIES)
unset(MARIADB_CONNECTOR_INCLUDE_DIR)
endif()