From 5e5a522d27c23069e6da7f3c315abb01ccad34f9 Mon Sep 17 00:00:00 2001 From: Johan Wikman Date: Fri, 29 Jan 2016 16:18:38 +0200 Subject: [PATCH] Rename EMBEDDED_LIB to MYSQL_EMBEDDED_LIB Makes it clearer what embedded lib we are talking about. --- cmake/FindMySQL.cmake | 50 +++++++++---------- query_classifier/CMakeLists.txt | 2 +- .../qc_mysqlembedded/CMakeLists.txt | 2 +- 3 files changed, 27 insertions(+), 27 deletions(-) diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index 4010c8e20..a3cbfe8ec 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -3,7 +3,7 @@ # The following variables are set: # MYSQL_VERSION - The MySQL version number # MYSQL_PROVIDER - The MySQL provider e.g. MariaDB -# EMBEDDED_LIB - The MySQL embedded library +# MYSQL_EMBEDDED_LIB - The MySQL embedded library find_file(MYSQL_VERSION_H mysql_version.h PATH_SUFFIXES mysql) if(MYSQL_VERSION_H MATCHES "MYSQL_VERSION_H-NOTFOUND") @@ -47,18 +47,18 @@ if(NOT (MYSQL_VERSION VERSION_LESS 10.1)) endif() -if (DEFINED EMBEDDED_LIB) - if( NOT (IS_DIRECTORY ${EMBEDDED_LIB}) ) - debugmsg("EMBEDDED_LIB is not a directory: ${EMBEDDED_LIB}") +if (DEFINED MYSQL_EMBEDDED_LIB) + if( NOT (IS_DIRECTORY ${MYSQL_EMBEDDED_LIB}) ) + debugmsg("MYSQL_EMBEDDED_LIB is not a directory: ${MYSQL_EMBEDDED_LIB}") if(${CMAKE_VERSION} VERSION_LESS 2.8.12 ) set(COMP_VAR PATH) else() set(COMP_VAR DIRECTORY) endif() - get_filename_component(EMBEDDED_LIB ${EMBEDDED_LIB} ${COMP_VAR}) - debugmsg("EMBEDDED_LIB directory component: ${EMBEDDED_LIB}") + get_filename_component(MYSQL_EMBEDDED_LIB ${MYSQL_EMBEDDED_LIB} ${COMP_VAR}) + debugmsg("MYSQL_EMBEDDED_LIB directory component: ${MYSQL_EMBEDDED_LIB}") endif() - debugmsg("Searching for the embedded library at: ${EMBEDDED_LIB}") + debugmsg("Searching for the embedded library at: ${MYSQL_EMBEDDED_LIB}") endif() if(STATIC_EMBEDDED) @@ -66,38 +66,38 @@ if(STATIC_EMBEDDED) debugmsg("Using the static embedded library...") set(OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES ".a") - if (DEFINED EMBEDDED_LIB) - debugmsg("Searching for libmysqld.a at: ${EMBEDDED_LIB}") - find_library(EMBEDDED_LIB_STATIC libmysqld.a PATHS ${EMBEDDED_LIB} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH) + if (DEFINED MYSQL_EMBEDDED_LIB) + debugmsg("Searching for libmysqld.a at: ${MYSQL_EMBEDDED_LIB}") + find_library(MYSQL_EMBEDDED_LIB_STATIC libmysqld.a PATHS ${MYSQL_EMBEDDED_LIB} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH) else() - find_library(EMBEDDED_LIB_STATIC libmysqld.a PATH_SUFFIXES mysql mariadb) + find_library(MYSQL_EMBEDDED_LIB_STATIC libmysqld.a PATH_SUFFIXES mysql mariadb) endif() - debugmsg("Search returned: ${EMBEDDED_LIB_STATIC}") + debugmsg("Search returned: ${MYSQL_EMBEDDED_LIB_STATIC}") - set(EMBEDDED_LIB ${EMBEDDED_LIB_STATIC} CACHE FILEPATH "Path to libmysqld" FORCE) + set(MYSQL_EMBEDDED_LIB ${MYSQL_EMBEDDED_LIB_STATIC} CACHE FILEPATH "Path to libmysqld" FORCE) set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES}) else() debugmsg("Using the dynamic embedded library...") set(OLD_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) set(CMAKE_FIND_LIBRARY_SUFFIXES ".so") - if (DEFINED EMBEDDED_LIB) - debugmsg("Searching for libmysqld.so at: ${EMBEDDED_LIB}") - find_library(EMBEDDED_LIB_DYNAMIC mysqld PATHS ${EMBEDDED_LIB} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH) + if (DEFINED MYSQL_EMBEDDED_LIB) + debugmsg("Searching for libmysqld.so at: ${MYSQL_EMBEDDED_LIB}") + find_library(MYSQL_EMBEDDED_LIB_DYNAMIC mysqld PATHS ${MYSQL_EMBEDDED_LIB} PATH_SUFFIXES mysql mariadb NO_DEFAULT_PATH) else() - find_library(EMBEDDED_LIB_DYNAMIC mysqld PATH_SUFFIXES mysql mariadb) + find_library(MYSQL_EMBEDDED_LIB_DYNAMIC mysqld PATH_SUFFIXES mysql mariadb) endif() - debugmsg("Search returned: ${EMBEDDED_LIB_DYNAMIC}") - set(EMBEDDED_LIB ${EMBEDDED_LIB_DYNAMIC} CACHE FILEPATH "Path to libmysqld" FORCE) + debugmsg("Search returned: ${MYSQL_EMBEDDED_LIB_DYNAMIC}") + set(MYSQL_EMBEDDED_LIB ${MYSQL_EMBEDDED_LIB_DYNAMIC} CACHE FILEPATH "Path to libmysqld" FORCE) set(CMAKE_FIND_LIBRARY_SUFFIXES ${OLD_SUFFIXES}) endif() -unset(EMBEDDED_LIB_DYNAMIC) -unset(EMBEDDED_LIB_STATIC) +unset(MYSQL_EMBEDDED_LIB_DYNAMIC) +unset(MYSQL_EMBEDDED_LIB_STATIC) unset(OLD_SUFFIXES) -check_library_exists(${EMBEDDED_LIB} pcre_stack_guard ${EMBEDDED_LIB} HAVE_EMBEDDED_PCRE) +check_library_exists(${MYSQL_EMBEDDED_LIB} pcre_stack_guard ${MYSQL_EMBEDDED_LIB} HAVE_EMBEDDED_PCRE) if(HAVE_EMBEDDED_PCRE) set(PCRE_LINK_FLAGS "" CACHE INTERNAL "pcre linker flags") @@ -110,8 +110,8 @@ else() message(FATAL_ERROR "Could not find PCRE libraries.") endif() endif() -if( (${EMBEDDED_LIB} MATCHES "NOTFOUND") OR (${EMBEDDED_LIB} MATCHES "NOTFOUND")) - message(FATAL_ERROR "Library not found: libmysqld. If your install of MySQL is in a non-default location, please provide the location with -DEMBEDDED_LIB=") +if( (${MYSQL_EMBEDDED_LIB} MATCHES "NOTFOUND") OR (${MYSQL_EMBEDDED_LIB} MATCHES "NOTFOUND")) + message(FATAL_ERROR "Library not found: libmysqld. If your install of MySQL is in a non-default location, please provide the location with -DMYSQL_EMBEDDED_LIB=") else() - message(STATUS "Using embedded library: ${EMBEDDED_LIB}") + message(STATUS "Using embedded library: ${MYSQL_EMBEDDED_LIB}") endif() diff --git a/query_classifier/CMakeLists.txt b/query_classifier/CMakeLists.txt index 4c411eb1e..7191833bf 100644 --- a/query_classifier/CMakeLists.txt +++ b/query_classifier/CMakeLists.txt @@ -1,6 +1,6 @@ add_library(query_classifier SHARED query_classifier.cc) -target_link_libraries(query_classifier ${EMBEDDED_LIB} aio crypt crypto dl m ${PCRE_LINK_FLAGS} ssl stdc++ z) +target_link_libraries(query_classifier ${MYSQL_EMBEDDED_LIB} aio crypt crypto dl m ${PCRE_LINK_FLAGS} ssl stdc++ z) set_target_properties(query_classifier PROPERTIES VERSION "1.0.0") set_target_properties(query_classifier PROPERTIES LINK_FLAGS -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/query_classifier.map) #set_target_properties(query_classifier PROPERTIES LINK_FLAGS -Wl,-z,defs) diff --git a/query_classifier/qc_mysqlembedded/CMakeLists.txt b/query_classifier/qc_mysqlembedded/CMakeLists.txt index 73bf5f2cf..67066754d 100644 --- a/query_classifier/qc_mysqlembedded/CMakeLists.txt +++ b/query_classifier/qc_mysqlembedded/CMakeLists.txt @@ -1,6 +1,6 @@ add_library(qc_mysqlembedded SHARED qc_mysqlembedded.cc) -target_link_libraries(qc_mysqlembedded ${EMBEDDED_LIB} aio crypt crypto dl m ${PCRE_LINK_FLAGS} ssl stdc++ z) +target_link_libraries(qc_mysqlembedded ${MYSQL_EMBEDDED_LIB} aio crypt crypto dl m ${PCRE_LINK_FLAGS} ssl stdc++ z) set_target_properties(qc_mysqlembedded PROPERTIES VERSION "1.0.0") set_target_properties(qc_mysqlembedded PROPERTIES LINK_FLAGS -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/qc_mysqlembedded.map) #set_target_properties(qc_mysqlembedded PROPERTIES LINK_FLAGS -Wl,-z,defs)