Added MYSQLCLIENT_LIB_NAME for linking mysqlclient statically or dynamically. Also changed libmysqlclient as default library instead of libmysqlclient_r. MYSQL_LIB_DIR, MYSQL_INCLUDE_DIR, MYSQL_LINK_FLAGS and MYSQL_CXXFLAGS will be obtained from mysql_config only when they are not provided using cmake options.

Hemant Dangi · Hemant Dangi · commit dcaef0d39c30 · 2013-09-12T19:22:19.000+05:30
diff --git a/FindMySQL.cmake b/FindMySQL.cmake
@@ -52,21 +52,21 @@ ENDMACRO(_MYSQL_CONFIG_REPLACE _regex1 _replace _regex2 _opt)
 
 IF (MYSQLCLIENT_LIB_NAME)
   IF (${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient_r.a" 
-       OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient_r.a" 
+       OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient.a" 
        OR ${MYSQLCLIENT_LIB_NAME} MATCHES "mysqlclient*")
     SET(MYSQLCLIENT_STATIC_LINKING 1)
   ELSEIF (${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient_r.so" 
-           OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient_r.so" 
-           OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysql.dll")
+           OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient.so" 
+           OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysql.*")
     SET(MYSQLCLIENT_STATIC_LINKING 0)
   ENDIF (${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient_r.a" 
-       OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient_r.a" 
+       OR ${MYSQLCLIENT_LIB_NAME} MATCHES "libmysqlclient.a" 
        OR ${MYSQLCLIENT_LIB_NAME} MATCHES "mysqlclient*")
 ELSE (MYSQLCLIENT_LIB_NAME)
   IF (WIN32)
     SET(MYSQLCLIENT_LIB_NAME "mysqlclient.lib")
   ELSE (WIN32)
-    SET(MYSQLCLIENT_LIB_NAME "libmysqlclient_r.a libmysqlclient.a")
+    SET(MYSQLCLIENT_LIB_NAME "libmysqlclient.a libmysqlclient_r.a")
   ENDIF (WIN32)
   SET(MYSQLCLIENT_STATIC_LINKING 1)
 ENDIF (MYSQLCLIENT_LIB_NAME)
@@ -88,32 +88,47 @@ IF (NOT MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
   ENDIF (EXISTS "$ENV{MYSQL_DIR}/bin/mysql_config")
 ENDIF (NOT MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
  
-SET(MYSQL_CXXFLAGS "")
+
 IF(MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
   MESSAGE(STATUS "mysql_config was found ${MYSQL_CONFIG_EXECUTABLE}")
-  _MYSQL_CONFIG(MYSQL_INCLUDE_DIR "(^| )-I" "--include")
 
   EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--version"
           OUTPUT_VARIABLE __MYSQL_VERSION
           )
-  STRING(REGEX REPLACE "[\r\n]$" "" __MYSQL_VERSION "${__MYSQL_VERSION}")
-  STRING(REGEX MATCHALL "(4.1.[0-9]+|[5-9].[0-9]+.[0-9]+)" MYSQL_VERSION "${__MYSQL_VERSION}")
-  STRING(REGEX REPLACE "[.]" "0" MYSQL_NUM_VERSION "${MYSQL_VERSION}")
 
-  IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION LESS 50604)
-    EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
+  # Clean up so only numeric, in case of "-alpha" or similar
+  STRING(REGEX MATCHALL "([0-9]+.[0-9]+.[0-9]+)" MYSQL_VERSION "${__MYSQL_VERSION}")
+  # To create a fully numeric version, first normalize so N.NN.NN
+  STRING(REGEX REPLACE "[.]([0-9])[.]" ".0\\1." MYSQL_NUM_VERSION "${MYSQL_VERSION}")
+  STRING(REGEX REPLACE "[.]([0-9])$"   ".0\\1"  MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
+  # Finally remove the dot
+  STRING(REGEX REPLACE "[.]" "" MYSQL_NUM_VERSION "${MYSQL_NUM_VERSION}")
+
+  IF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
+    EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
             OUTPUT_VARIABLE _mysql_config_output
             )
-  ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION LESS 50604)
-    EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cxxflags"
+    SET(MYSQL_CXX_LINKAGE 1)
+  ELSE (MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
+    EXECUTE_PROCESS(COMMAND ${MYSQL_CONFIG_EXECUTABLE} "--cflags"
             OUTPUT_VARIABLE _mysql_config_output
             )
-  ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION LESS 50604)
+  ENDIF(MYSQL_CXX_LINKAGE OR MYSQL_NUM_VERSION GREATER 50603)
 
-  STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
-  STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
+  IF (NOT MYSQL_LINK_FLAGS)
+    STRING(REGEX MATCHALL "-m([^\r\n]+)" MYSQL_LINK_FLAGS "${_mysql_config_output}")
+  ENDIF (NOT MYSQL_LINK_FLAGS)
+  IF (NOT MYSQL_CXXFLAGS)
+    STRING(REGEX REPLACE "[\r\n]$" "" MYSQL_CXXFLAGS "${_mysql_config_output}")
+  ENDIF (NOT MYSQL_CXXFLAGS)
 #  ADD_DEFINITIONS("${MYSQL_CXXFLAGS}")
-ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+ENDIF (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+
+
+#----------------- FIND MYSQL_INCLUDE_DIR -------------------
+IF(NOT MYSQL_INCLUDE_DIR AND MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+  _MYSQL_CONFIG(MYSQL_INCLUDE_DIR "(^| )-I" "--include")
+ELSE(NOT MYSQL_INCLUDE_DIR AND MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
   MESSAGE(STATUS "ENV{MYSQL_DIR} = $ENV{MYSQL_DIR}")
   FIND_PATH(MYSQL_INCLUDE_DIR mysql.h
     ${MYSQL_INCLUDE_DIR}
@@ -127,7 +142,8 @@ ELSE (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
     /usr/local/mysql/include/mysql
     $ENV{ProgramFiles}/MySQL/*/include
     $ENV{SystemDrive}/MySQL/*/include)
-ENDIF (MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+ENDIF(NOT MYSQL_INCLUDE_DIR AND MYSQL_CONFIG_EXECUTABLE AND NOT WIN32)
+
 
 #----------------- FIND MYSQL_LIB_DIR -------------------
 IF (WIN32)
@@ -143,12 +159,6 @@ IF (WIN32)
 		ADD_DEFINITIONS(-DDBUG_OFF)
 	ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug)
 
-  IF (MYSQLCLIENT_STATIC_LINKING)
-    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
-  ELSE (MYSQLCLIENT_STATIC_LINKING)
-    SET(CMAKE_FIND_LIBRARY_SUFFIXES ".dll")
-  ENDIF (MYSQLCLIENT_STATIC_LINKING)
-
   FIND_LIBRARY(MYSQL_LIB 
     NAMES 
       ${MYSQLCLIENT_LIB_NAME}
@@ -173,19 +183,11 @@ IF (WIN32)
       $ENV{SystemDrive}/MySQL/*/lib)
 
   SET(MYSQL_LIBRARIES ${MYSQL_LIB}) 
-
-  # Optionally add more libraries from the command line
-  # using -DEXTRA_MYSQL_DEP=...
-  IF (EXTRA_MYSQL_DEP)
-     LIST(APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP})
-  ENDIF (EXTRA_MYSQL_DEP)
-
-  SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES})
   IF(MYSQL_LIB)
     GET_FILENAME_COMPONENT(MYSQL_LIB_DIR ${MYSQL_LIB} PATH)
   ENDIF(MYSQL_LIB)
 ELSE (WIN32)
-  IF (MYSQL_CONFIG_EXECUTABLE)
+  IF (NOT MYSQL_LIB_DIR AND MYSQL_CONFIG_EXECUTABLE)
     # In MySQL Server 5.6.10 "mysql_config" outputs -lssl
                  # -lcrypto dependencies even if (as it is with the
     # Oracle built binaries) OpenSSL is linked statically
@@ -224,27 +226,17 @@ ELSE (WIN32)
    
     IF (MYSQLCLIENT_STATIC_LINKING)
       _MYSQL_CONFIG_REPLACE(MYSQL_LIBRARIES 
-             "mysqlclient(_r| |$)" "${MYSQL_LIB}" "(^| )-l" "--libs_r")
-      IF (NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
-        LIST(APPEND MYSQL_LIBRARIES "rt")
-      ENDIF ()
+             "(mysqlclient|mysqlclient_r)" "${MYSQL_LIB}" "(^| )-l" "--libs")
     ELSE (MYSQLCLIENT_STATIC_LINKING)
-      _MYSQL_CONFIG(MYSQL_LIBRARIES "(^| )-l" "--libs_r")
+      _MYSQL_CONFIG(MYSQL_LIBRARIES "(^| )-l" "--libs")
     ENDIF (MYSQLCLIENT_STATIC_LINKING)
 
-    _MYSQL_CONFIG(MYSQL_CLIB_DIR "(^| )-L" "--libs_r")
-
-    # Optionally add more libraries from the command line
-    # using -DEXTRA_MYSQL_DEP=...
-    IF (EXTRA_MYSQL_DEP)
-       LIST(APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP})
-    ENDIF (EXTRA_MYSQL_DEP)
+    _MYSQL_CONFIG(MYSQL_CLIB_DIR "(^| )-L" "--libs")
 
     IF (NOT MYSQL_LIB_DIR)
       SET(MYSQL_LIB_DIR ${MYSQL_CLIB_DIR}) 
     ENDIF (NOT MYSQL_LIB_DIR)
-    SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES}) 
-  ELSE (MYSQL_CONFIG_EXECUTABLE)
+  ELSE (NOT MYSQL_LIB_DIR AND MYSQL_CONFIG_EXECUTABLE)
     FIND_LIBRARY(MYSQL_LIB 
       NAMES 
         ${MYSQLCLIENT_LIB_NAME}
@@ -267,26 +259,26 @@ ELSE (WIN32)
         /opt/mysql/mysql/lib
         /opt/mysql/mysql/lib/mysql)
 
-
     SET(MYSQL_LIBRARIES ${MYSQL_LIB})
- 
-    IF (MYSQLCLIENT_STATIC_LINKING)
-       LIST(APPEND MYSQL_LIBRARIES "rt")
-    ENDIF (MYSQLCLIENT_STATIC_LINKING)
-
-    # Optionally add more libraries from the command line
-    # using -DEXTRA_MYSQL_DEP=...
-    IF (EXTRA_MYSQL_DEP)
-      LIST(APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP})
-    ENDIF (EXTRA_MYSQL_DEP)
- 
-    SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES})
     IF(MYSQL_LIB)
       GET_FILENAME_COMPONENT(MYSQL_LIB_DIR ${MYSQL_LIB} PATH)
     ENDIF(MYSQL_LIB)
-  ENDIF (MYSQL_CONFIG_EXECUTABLE)
+  ENDIF (NOT MYSQL_LIB_DIR AND MYSQL_CONFIG_EXECUTABLE)
+
+  IF (MYSQLCLIENT_STATIC_LINKING AND
+      NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+    LIST(APPEND MYSQL_LIBRARIES "rt")
+  ENDIF ()
 ENDIF (WIN32)
 
+SET(MYSQL_CLIENT_LIBS ${MYSQL_LIBRARIES})
+
+# Optionally add more libraries from the command line
+# using -DEXTRA_MYSQL_DEP=...
+IF (EXTRA_MYSQL_DEP)
+   LIST(APPEND MYSQL_LIBRARIES ${EXTRA_MYSQL_DEP})
+ENDIF (EXTRA_MYSQL_DEP)
+
 
 SET(VERBOSE 1)
 IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
