From b1d55cb0833edc374c73840e748fe33ed14ce34c Mon Sep 17 00:00:00 2001
From: kervala <devnull@localhost>
Date: Mon, 20 Sep 2010 21:37:15 +0200
Subject: [PATCH] Fixed: Debug version of mysqlclient

---
 code/CMakeModules/FindMySQL.cmake | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/code/CMakeModules/FindMySQL.cmake b/code/CMakeModules/FindMySQL.cmake
index c52e61c03..b9970f63c 100644
--- a/code/CMakeModules/FindMySQL.cmake
+++ b/code/CMakeModules/FindMySQL.cmake
@@ -23,12 +23,26 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
       $ENV{SystemDrive}/MySQL/*/include)
 
   IF(WIN32 AND MSVC)
-    FIND_LIBRARY(MYSQL_LIBRARIES NAMES libmysql mysqlclient
+    FIND_LIBRARY(MYSQL_LIBRARY_RELEASE NAMES libmysql mysqlclient
+      PATHS
+      $ENV{ProgramFiles}/MySQL/*/lib/opt
+      $ENV{SystemDrive}/MySQL/*/lib/opt)
+
+    FIND_LIBRARY(MYSQL_LIBRARY_DEBUG NAMES libmysqld mysqlclientd
       PATHS
       $ENV{ProgramFiles}/MySQL/*/lib/opt
       $ENV{SystemDrive}/MySQL/*/lib/opt)
   ELSE(WIN32 AND MSVC)
-    FIND_LIBRARY(MYSQL_LIBRARIES NAMES mysqlclient
+    FIND_LIBRARY(MYSQL_LIBRARY_RELEASE NAMES mysqlclient
+      PATHS
+      /usr/lib
+      /usr/local/lib
+      /usr/lib/mysql
+      /usr/local/lib/mysql
+      /opt/local/lib/mysql5/mysql
+      )
+
+    FIND_LIBRARY(MYSQL_LIBRARY_DEBUG NAMES mysqlclientd
       PATHS
       /usr/lib
       /usr/local/lib
@@ -38,6 +52,15 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
       )
   ENDIF(WIN32 AND MSVC)
 
+  IF(MYSQL_INCLUDE_DIR)
+    IF(MYSQL_LIBRARY_RELEASE)
+      SET(MYSQL_LIBRARIES "optimized;${MYSQL_LIBRARY_RELEASE}")
+      IF(MYSQL_LIBRARY_DEBUG)
+        SET(MYSQL_LIBRARIES "${MYSQL_LIBRARIES};debug;${MYSQL_LIBRARY_DEBUG}")
+      ENDIF(MYSQL_LIBRARY_DEBUG)
+    ENDIF(MYSQL_LIBRARY_RELEASE)
+  ENDIF(MYSQL_INCLUDE_DIR)
+
   IF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
     SET(MYSQL_FOUND TRUE)
     MESSAGE(STATUS "Found MySQL: ${MYSQL_INCLUDE_DIR}, ${MYSQL_LIBRARIES}")
@@ -46,6 +69,6 @@ ELSE(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
     MESSAGE(STATUS "MySQL not found.")
   ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)
 
-  MARK_AS_ADVANCED(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES)
+  MARK_AS_ADVANCED(MYSQL_LIBRARY_RELEASE MYSQL_LIBRARY_DEBUG)
 
 ENDIF(MYSQL_INCLUDE_DIR AND MYSQL_LIBRARIES)