* Fix logic in FindMySQL cmake file
* *nix compiles again --HG-- branch : trunk
This commit is contained in:
1 parent
5238320af0
commit
bc704b4a55
1 file changed
+12
-4
+12
-4
@@ -87,7 +87,6 @@ find_path(MYSQL_INCLUDE_DIR
|
|||||||
|
|
||||||
if( UNIX )
|
if( UNIX )
|
||||||
foreach(LIB ${MYSQL_ADD_LIBRARIES})
|
foreach(LIB ${MYSQL_ADD_LIBRARIES})
|
||||||
endif( UNIX )
|
|
||||||
find_library( MYSQL_LIBRARY
|
find_library( MYSQL_LIBRARY
|
||||||
NAMES
|
NAMES
|
||||||
mysql libmysql ${LIB}
|
mysql libmysql ${LIB}
|
||||||
@@ -98,6 +97,17 @@ endif( UNIX )
|
|||||||
/usr/local/lib
|
/usr/local/lib
|
||||||
/usr/local/lib/mysql
|
/usr/local/lib/mysql
|
||||||
/usr/local/mysql/lib
|
/usr/local/mysql/lib
|
||||||
|
DOC "Specify the location of the mysql library here."
|
||||||
|
)
|
||||||
|
endforeach(LIB ${MYSQL_ADD_LIBRARY})
|
||||||
|
endif( UNIX )
|
||||||
|
|
||||||
|
if( WIN32 )
|
||||||
|
find_library( MYSQL_LIBRARY
|
||||||
|
NAMES
|
||||||
|
mysql libmysql ${LIB}
|
||||||
|
PATHS
|
||||||
|
${MYSQL_ADD_LIBRARIES_PATH}
|
||||||
"C:/Program Files/MySQL/lib"
|
"C:/Program Files/MySQL/lib"
|
||||||
"C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
|
"C:/Program Files/MySQL/MySQL Server 5.0/lib/opt"
|
||||||
"C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
|
"C:/Program Files/MySQL/MySQL Server 5.1/lib/opt"
|
||||||
@@ -109,9 +119,7 @@ endif( UNIX )
|
|||||||
"c:/msys/local/include"
|
"c:/msys/local/include"
|
||||||
DOC "Specify the location of the mysql library here."
|
DOC "Specify the location of the mysql library here."
|
||||||
)
|
)
|
||||||
if( UNIX)
|
endif( WIN32 )
|
||||||
endforeach(LIB ${MYSQL_ADD_LIBRARY})
|
|
||||||
endif( UNIX )
|
|
||||||
|
|
||||||
# On Windows you typically don't need to include any extra libraries
|
# On Windows you typically don't need to include any extra libraries
|
||||||
# to build MYSQL stuff.
|
# to build MYSQL stuff.
|
||||||
|
|||||||
Reference in new issue
Block a user