From 79952de539eb4dd639456fcf0d475207ec71bacf Mon Sep 17 00:00:00 2001 From: Volker Krause Date: Fri, 13 Oct 2006 09:30:09 +0000 Subject: Check for MYSQL_OPT_USE_EMBEDDED_CONNECTION enum value. svn path=/trunk/KDE/kdelibs/; revision=595072 --- modules/FindMySQL.cmake | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'modules/FindMySQL.cmake') diff --git a/modules/FindMySQL.cmake b/modules/FindMySQL.cmake index dd50ed54..a61f62ac 100644 --- a/modules/FindMySQL.cmake +++ b/modules/FindMySQL.cmake @@ -31,6 +31,12 @@ find_library(MYSQL_EMBEDDED_LIBRARIES NAMES mysqld /opt/mysql/lib/mysql ) +macro_push_required_vars() +set( CMAKE_REQUIRED_INCLUDES ${MYSQL_INCLUDE_DIR} ) +set( CMAKE_REQUIRED_LIBRARIES ${MYSQL_EMBEDDED_LIBRARIES} ) +check_cxx_source_compiles( "#include \nint main() { int i = MYSQL_OPT_USE_EMBEDDED_CONNECTION; }" HAVE_MYSQL_OPT_EMBEDDED_CONNECTION ) +macro_pop_required_vars() + if(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) set(MYSQL_FOUND TRUE) message(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}") @@ -39,12 +45,12 @@ else(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) message(STATUS "MySQL not found.") endif(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES) -if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +if(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND TRUE) message(STATUS "Found MySQL Embedded: ${MYSQL_INCLUDE_DIR}, ${MYSQL_EMBEDDED_LIBRARIES}") -else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +else(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) set(MYSQL_EMBEDDED_FOUND FALSE) message(STATUS "MySQL Embedded not found.") -endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES) +endif(MYSQL_INCLUDE_DIR AND MYSQL_EMBEDDED_LIBRARIES AND HAVE_MYSQL_OPT_USE_EMBEDDED_CONNECTION) mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES MYSQL_EMBEDDED_LIBRARIES) -- cgit v1.2.1