diff options
| author | click <none@none> | 2010-08-14 08:39:44 +0200 |
|---|---|---|
| committer | click <none@none> | 2010-08-14 08:39:44 +0200 |
| commit | 362a1eed51c416bacbc58bf89cd48ad02bd1e585 (patch) | |
| tree | fc9b9c9f75aa40e9275d07b1c79f127de28a89e0 | |
| parent | 3cf6af17798d73b6a6acd54a6083d82192f29f7a (diff) | |
Buildsystem/Windows: Add environment-based directories to MySQL search-paths
--HG--
branch : trunk
| -rw-r--r-- | cmake/FindMySQL.cmake | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cmake/FindMySQL.cmake b/cmake/FindMySQL.cmake index aa62d89d9b5..bc4edaf1c24 100644 --- a/cmake/FindMySQL.cmake +++ b/cmake/FindMySQL.cmake @@ -80,6 +80,8 @@ find_path(MYSQL_INCLUDE_DIR "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/include" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/include" + "$ENV{ProgramFiles}/MySQL/*/include" + "$ENV{SystemDrive}/MySQL/*/include" "c:/msys/local/include" DOC "Specify the directory containing mysql.h." @@ -105,7 +107,7 @@ endif( UNIX ) if( WIN32 ) find_library( MYSQL_LIBRARY NAMES - mysql libmysql ${LIB} + libmysql PATHS ${MYSQL_ADD_LIBRARIES_PATH} "C:/Program Files/MySQL/lib" @@ -116,6 +118,8 @@ if( WIN32 ) "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.0;Location]/lib/opt" "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Wow6432Node\\MySQL AB\\MySQL Server 5.1;Location]/lib/opt" + "$ENV{ProgramFiles}/MySQL/*/lib/opt" + "$ENV{SystemDrive}/MySQL/*/lib/opt" "c:/msys/local/include" DOC "Specify the location of the mysql library here." ) |