From: jbalint
Date: June 20 2007 9:28pm
Subject: Connector/ODBC 3.51 commit: r528 - in trunk: . cmake driver
List-Archive: http://lists.mysql.com/commits/29222
Message-Id: <200706202128.l5KLS5Sx030760@bk-internal.mysql.com>
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Modified:
   trunk/CMakeLists.txt
   trunk/cmake/FindMySQL.cmake
   trunk/driver/CMakeLists.txt
Log:
add correct support for MySQL debug libs and bin vs custom built trees
setup top-level bin/lib dirs for output

Modified: trunk/CMakeLists.txt
===================================================================
--- trunk/CMakeLists.txt	2007-06-20 18:56:10 UTC (rev 527)
+++ trunk/CMakeLists.txt	2007-06-20 21:28:04 UTC (rev 528)
@@ -105,6 +105,9 @@
 	ADD_DEFINITIONS("-D_WINDOWS -D__WIN__ -D_WIN32 -D_CRT_SECURE_NO_DEPRECATE")
 ENDIF(ODBC_WIN)
 
+SET(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
+SET(LIBRARY_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/lib")
+
 ENABLE_TESTING()
 
 ADD_SUBDIRECTORY(MYODBCDbg)

Modified: trunk/cmake/FindMySQL.cmake
===================================================================
--- trunk/cmake/FindMySQL.cmake	2007-06-20 18:56:10 UTC (rev 527)
+++ trunk/cmake/FindMySQL.cmake	2007-06-20 21:28:04 UTC (rev 528)
@@ -37,12 +37,23 @@
 
 #----------------- FIND MYSQL_LIB_DIR -------------------
 IF (ODBC_WINDOWS)
+	# Set lib path suffixes
+	# dist = for mysql binary distributions
+	# build = for custom built tree
+	IF (CMAKE_BUILD_TYPE STREQUAL Debug)
+		SET(libsuffixDist debug)
+		SET(libsuffixBuild Debug)
+	ELSE (CMAKE_BUILD_TYPE STREQUAL Debug)
+		SET(libsuffixDist opt)
+		SET(libsuffixBuild Release)
+	ENDIF (CMAKE_BUILD_TYPE STREQUAL Debug)
+
 	find_library(MYSQL_LIB NAMES mysqlclient
 				 PATHS
-				 $ENV{MYSQL_DIR}/lib/opt
-				 $ENV{MYSQL_DIR}/client/release
-				 $ENV{ProgramFiles}/MySQL/*/lib/opt
-				 $ENV{SystemDrive}/MySQL/*/lib/opt)
+				 $ENV{MYSQL_DIR}/lib/${libsuffixDist}
+				 $ENV{MYSQL_DIR}/client/${libsuffixBuild}
+				 $ENV{ProgramFiles}/MySQL/*/lib/${libsuffixDist}
+				 $ENV{SystemDrive}/MySQL/*/lib/${libsuffixDist})
 ELSE (ODBC_WINDOWS)
 	find_library(MYSQL_LIB NAMES mysqlclient_r
 				 PATHS

Modified: trunk/driver/CMakeLists.txt
===================================================================
--- trunk/driver/CMakeLists.txt	2007-06-20 18:56:10 UTC (rev 527)
+++ trunk/driver/CMakeLists.txt	2007-06-20 21:28:04 UTC (rev 528)
@@ -72,10 +72,21 @@
 
 IF (ODBC_WINDOWS)
 	TARGET_LINK_LIBRARIES(myodbc3 user32 advapi32 wsock32 odbc32 odbccp32 ws2_32 myodbc3u
-						  mysqlclient
-						  zlib
-						  yassl
-						  taocrypt)
+						  mysqlclient)
+
+	FIND_LIBRARY(MYSQL_ZLIB zlib)
+	FIND_LIBRARY(MYSQL_YASSL yassl)
+	FIND_LIBRARY(MYSQL_TAOCRYPT taocrypt)
+	IF (MYSQL_ZLIB)
+		TARGET_LINK_LIBRARIES(myodbc3 zlib)
+	ENDIF (MYSQL_ZLIB)
+	IF (MYSQL_YASSL)
+		TARGET_LINK_LIBRARIES(myodbc3 yassl)
+	ENDIF (MYSQL_YASSL)
+	IF (MYSQL_TAOCRYPT)
+		TARGET_LINK_LIBRARIES(myodbc3 taocrypt)
+	ENDIF (MYSQL_TAOCRYPT)
+
 ENDIF (ODBC_WINDOWS)