Connector/ODBC 3.51 commit: r822 - in branches/guffert: cmake driver

[jbalint]

Modified:
   branches/guffert/cmake/FindMySQL.cmake
   branches/guffert/driver/CMakeLists.txt
Log:
make a separate variables for all mysql client libraries

Modified: branches/guffert/cmake/FindMySQL.cmake
===================================================================
--- branches/guffert/cmake/FindMySQL.cmake	2007-10-16 18:20:57 UTC (rev 821)
+++ branches/guffert/cmake/FindMySQL.cmake	2007-10-17 04:36:24 UTC (rev 822)
@@ -77,10 +77,25 @@
 IF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
 	SET(MYSQL_FOUND TRUE)
 
-	MESSAGE(STATUS "MySQL Include dir: ${MYSQL_INCLUDE_DIR}  library dir: ${MYSQL_LIB_DIR}")
-
 	INCLUDE_DIRECTORIES(${MYSQL_INCLUDE_DIR})
 	LINK_DIRECTORIES(${MYSQL_LIB_DIR})
+
+	FIND_LIBRARY(MYSQL_ZLIB zlib PATHS ${MYSQL_LIB_DIR})
+	FIND_LIBRARY(MYSQL_YASSL yassl PATHS ${MYSQL_LIB_DIR})
+	FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt PATHS ${MYSQL_LIB_DIR})
+	SET(MYSQL_CLIENT_LIBS mysqlclient)
+	IF (MYSQL_ZLIB)
+		SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} zlib)
+	ENDIF (MYSQL_ZLIB)
+	IF (MYSQL_YASSL)
+		SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} yassl)
+	ENDIF (MYSQL_YASSL)
+	IF (MYSQL_TAOCRYPT)
+		SET(MYSQL_CLIENT_LIBS ${MYSQL_CLIENT_LIBS} taocrypt)
+	ENDIF (MYSQL_TAOCRYPT)
+
+	MESSAGE(STATUS "MySQL Include dir: ${MYSQL_INCLUDE_DIR}  library dir: ${MYSQL_LIB_DIR}")
+	MESSAGE(STATUS "MySQL client libraries: ${MYSQL_CLIENT_LIBS}")
 ELSE (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)
 	MESSAGE(FATAL_ERROR "Cannot find MySQL. Include dir: ${MYSQL_INCLUDE_DIR}  library dir:
${MYSQL_LIB_DIR}")
 ENDIF (MYSQL_INCLUDE_DIR AND MYSQL_LIB_DIR)

Modified: branches/guffert/driver/CMakeLists.txt
===================================================================
--- branches/guffert/driver/CMakeLists.txt	2007-10-16 18:20:57 UTC (rev 821)
+++ branches/guffert/driver/CMakeLists.txt	2007-10-17 04:36:24 UTC (rev 822)
@@ -39,20 +39,7 @@
 IF(WIN32)
 	TARGET_LINK_LIBRARIES(myodbc5
 				user32 advapi32 wsock32 ws2_32 myodbc3u
-				mysqlclient ${ODBCLIB} ${ODBCINSTLIB})
-
-	FIND_LIBRARY(MYSQL_ZLIB zlib)
-	FIND_LIBRARY(MYSQL_YASSL yassl)
-	FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt)
-	IF (MYSQL_ZLIB)
-		TARGET_LINK_LIBRARIES(myodbc5 zlib)
-	ENDIF (MYSQL_ZLIB)
-	IF (MYSQL_YASSL)
-		TARGET_LINK_LIBRARIES(myodbc5 yassl)
-	ENDIF (MYSQL_YASSL)
-	IF (MYSQL_TAOCRYPT)
-		TARGET_LINK_LIBRARIES(myodbc5 taocrypt)
-	ENDIF (MYSQL_TAOCRYPT)
+				${MYSQL_CLIENT_LIBS} ${ODBCLIB} ${ODBCINSTLIB})
 ELSE(WIN32)
 	SET(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${ODBC_LINK_FLAGS}")
 	TARGET_LINK_LIBRARIES(myodbc5 ltdl mysqlclient_r)