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

fixed some variables missing the FORCE keyword

Browse Source
This commit is contained in:
Markus Makela
2014-09-20 10:48:20 +03:00
parent 72550185ab
commit 8427b83884
1 changed files with 31 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
macros.cmake
View File

@ -52,7 +52,6 @@ macro(set_variables)
# Build tests # Build tests
set(BUILD_TESTS TRUE CACHE BOOL "Build tests") set(BUILD_TESTS TRUE CACHE BOOL "Build tests")
endmacro() endmacro()
macro(check_deps) macro(check_deps)
@ -77,14 +76,19 @@ endmacro()
macro(check_dirs) macro(check_dirs)
# Find the MySQL headers if they were not defined # Find the MySQL headers if they were not defined
if(NOT ( DEFINED MYSQL_DIR ) ) if(DEFINED MYSQL_DIR)
find_path(MYSQL_DIR mysql.h PATH_SUFFIXES mysql mariadb) message(STATUS "Searching for MySQL headers at: ${MYSQL_DIR}")
find_path(MYSQL_DIR_LOC mysql.h PATHS ${MYSQL_DIR} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH)
else()
find_path(MYSQL_DIR_LOC mysql.h PATH_SUFFIXES mysql mariadb)
endif()
message(STATUS "Search returned: ${MYSQL_DIR_LOC}")
set(MYSQL_DIR ${MYSQL_DIR_LOC} CACHE PATH "Path to MySQL headers" FORCE)
if(${MYSQL_DIR} STREQUAL "MYSQL_DIR-NOTFOUND") if(${MYSQL_DIR} STREQUAL "MYSQL_DIR-NOTFOUND")
message(FATAL_ERROR "Fatal Error: MySQL headers were not found.") message(FATAL_ERROR "Fatal Error: MySQL headers were not found.")
elseif(DEBUG_OUTPUT) else()
message(STATUS "Using MySQL headers found at: ${MYSQL_DIR}") message(STATUS "Using MySQL headers found at: ${MYSQL_DIR}")
endif() endif()
endif()
# Find the errmsg.sys file if it was not defied # Find the errmsg.sys file if it was not defied
if( NOT ( DEFINED ERRMSG ) ) if( NOT ( DEFINED ERRMSG ) )
@ -98,15 +102,29 @@ macro(check_dirs)
# Find the embedded mysql library # Find the embedded mysql library
if(STATIC_EMBEDDED) if(STATIC_EMBEDDED)
set(OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") set(CMAKE_FIND_LIBRARY_SUFFIXES ".a")
find_library(EMBEDDED_LIB_STATIC libmysqld.a PATH_SUFFIXES mysql mariadb) if (DEFINED EMBEDDED_LIB)
set(EMBEDDED_LIB ${EMBEDDED_LIB_STATIC}) message(STATUS "Searching for libmysqld.a at: ${EMBEDDED_LIB}")
set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES}) find_library(EMBEDDED_LIB_STATIC libmysqld.a PATHS ${EMBEDDED_LIB} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH)
else() else()
find_library(EMBEDDED_LIB_STATIC libmysqld.a PATH_SUFFIXES mysql mariadb)
endif()
message(STATUS "Search returned: ${EMBEDDED_LIB_STATIC}")
set(EMBEDDED_LIB ${EMBEDDED_LIB_STATIC} CACHE FILEPATH "Path to libmysqld" FORCE)
set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES})
else()
if (DEFINED EMBEDDED_LIB)
message(STATUS "Searching for libmysqld.so at: ${EMBEDDED_LIB}")
find_library(EMBEDDED_LIB_DYNAMIC mysqld PATHS ${EMBEDDED_LIB} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH)
else()
find_library(EMBEDDED_LIB_DYNAMIC mysqld PATH_SUFFIXES mysql mariadb) find_library(EMBEDDED_LIB_DYNAMIC mysqld PATH_SUFFIXES mysql mariadb)
set(EMBEDDED_LIB ${EMBEDDED_LIB_DYNAMIC}) endif()
message(STATUS "Search returned: ${EMBEDDED_LIB_DYNAMIC}")
set(EMBEDDED_LIB ${EMBEDDED_LIB_DYNAMIC} CACHE FILEPATH "Path to libmysqld" FORCE)
endif() endif()