diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-09 07:39:27 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-09 07:39:27 +0000 |
| commit | ab9b60f5c4501eb8d7bec4a053d73fc723ea31b5 (patch) | |
| tree | ceea0d69fbfe3366454c34157adc1baa414f291b /3rdparty/mysql/CMakeLists.txt | |
| parent | 912dfc3af719b251d8a5036e76fb2733dddad46c (diff) | |
| download | hercules-ab9b60f5c4501eb8d7bec4a053d73fc723ea31b5.tar.gz hercules-ab9b60f5c4501eb8d7bec4a053d73fc723ea31b5.tar.bz2 hercules-ab9b60f5c4501eb8d7bec4a053d73fc723ea31b5.tar.xz hercules-ab9b60f5c4501eb8d7bec4a053d73fc723ea31b5.zip | |
* CMake: added search for math library, made CPack existence optional, updated the search for mysqlclient and corrected misspelled variables (tested with FreeBSD-8.2-i386)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14893 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to '3rdparty/mysql/CMakeLists.txt')
| -rw-r--r-- | 3rdparty/mysql/CMakeLists.txt | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/3rdparty/mysql/CMakeLists.txt b/3rdparty/mysql/CMakeLists.txt index 3f792281c..f4996907f 100644 --- a/3rdparty/mysql/CMakeLists.txt +++ b/3rdparty/mysql/CMakeLists.txt @@ -42,25 +42,10 @@ endif( WIN32 ) # system # message( STATUS "Detecting system MYSQL" ) -find_program( MYSQL_CONFIG_EXECUTABLE "mysql_config" ) -mark_as_advanced( MYSQL_CONFIG_EXECUTABLE ) -if( MYSQL_CONFIG_EXECUTABLE ) - # use mysql_config data - message( "Found mysql_config: ${MYSQL_CONFIG_EXECUTABLE}" ) - execute_process( COMMAND "${MYSQL_CONFIG_EXECUTABLE} --libs" - OUTPUT_VARIABLE MYSQL_LIBRARIES ) - execute_process( COMMAND "${MYSQL_CONFIG_EXECUTABLE} --include" - OUTPUT_VARIABLE MYSQL_INCLUDE_DIRS ) - execute_process( COMMAND "${MYSQL_CONFIG_EXECUTABLE} --version" - OUTPUT_VARIABLE MYSQL_VERSION ) - message( STATUS "Found MYSQL: ${MYSQL_LIBRARIES} (found version ${MYSQL_VERSION})" ) -else() - # find mysql package - unset( MYSQL_LIBRARIES CACHE ) - unset( MYSQL_INCLUDE_DIRS CACHE ) - set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH} ) - find_package( MYSQL ) -endif() +unset( MYSQL_LIBRARIES CACHE ) +unset( MYSQL_INCLUDE_DIRS CACHE ) +set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH} ) +find_package( MYSQL ) set( MYSQL_SYSTEM_LIBRARIES "${MYSQL_LIBRARIES}" CACHE PATH "system mysql libraries" ) set( MYSQL_SYSTEM_INCLUDE_DIRS "${MYSQL_INCLUDE_DIRS}" |