[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdelibs/cmake/modules
From:       Volker Krause <volker.krause () rwth-aachen ! de>
Date:       2006-10-13 9:30:10
Message-ID: 1160731810.964182.3555.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 595072 by vkrause:

Check for MYSQL_OPT_USE_EMBEDDED_CONNECTION enum value.


 M  +9 -3      FindMySQL.cmake  


--- trunk/KDE/kdelibs/cmake/modules/FindMySQL.cmake #595071:595072
@@ -31,6 +31,12 @@
    /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 <mysql.h>\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 @@
    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)


[prev in list] [next in list] [prev in thread] [next in thread]