constcast
/
vermont
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed mysql cmake script (could not find mysql any more) 

git-svn-id: file:///Users/braun/svn/vermont/branches/vermont/new-template@2377 aef3b71b-58ee-0310-9ba9-8811b9f0742f
master
limmer 2010-05-20 12:23:53 +00:00
parent 15ddbeee9e
commit 4ed381f058
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/modules/FindMySQL.cmake
View File

@ -36,17 +36,16 @@ IF(UNIX)
EXEC_PROGRAM(${MYSQL_CONFIG}
ARGS --libs
OUTPUT_VARIABLE MY_TMP)
string (REGEX REPLACE "-L([^ ]*)( .*)?" "\\1" MY_TMP "${MY_TMP}")
string (REGEX REPLACE "(.* )?-L([^ ]*)( .*)?" "\\2" MY_TMP "${MY_TMP}")
SET(MYSQL_ADD_LIBRARY ${MY_TMP} CACHE FILEPATH INTERNAL)
ENDIF(MYSQL_CONFIG)
ELSE(UNIX)
set(MYSQL_ADD_INCLUDE_DIR "c:/msys/local/include" CACHE FILEPATH INTERNAL)
set(MYSQL_ADD_LIBRARY "c:/msys/local/lib" CACHE FILEPATH INTERNAL)
ENDIF(UNIX)
if (NOT DEFINED MYSQL_FOUND)
if (NOT MYSQL_FOUND)
find_path(MYSQL_INCLUDE_DIR mysql.h
/usr/local/include
@ -58,6 +57,7 @@ if (NOT DEFINED MYSQL_FOUND)
find_library(MYSQL_LIBRARIES NAMES mysqlclient
PATHS
/usr/lib
/usr/lib/mysql
/usr/local/lib
/usr/local/lib/mysql
@ -75,4 +75,4 @@ if (NOT DEFINED MYSQL_FOUND)
mark_as_advanced(MYSQL_INCLUDE_DIR MYSQL_LIBRARIES)
endif (NOT DEFINED MYSQL_FOUND)
endif (NOT MYSQL_FOUND)