diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 15:29:57 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-10 15:29:57 +0000 |
| commit | f817e3714747b39a364e99c536e0b802b24fd2c3 (patch) | |
| tree | 4feb82dd35e6d4b647dde3716f3fb2463aef0398 /3rdparty | |
| parent | ee66778144c8a069a04d5f77ec73dcab973c61d0 (diff) | |
| download | hercules-f817e3714747b39a364e99c536e0b802b24fd2c3.tar.gz hercules-f817e3714747b39a364e99c536e0b802b24fd2c3.tar.bz2 hercules-f817e3714747b39a364e99c536e0b802b24fd2c3.tar.xz hercules-f817e3714747b39a364e99c536e0b802b24fd2c3.zip | |
* CMake: lowered required version to 2.8.3 and moved custom cmake modules to 3rdparty/cmake.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14897 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to '3rdparty')
| -rw-r--r-- | 3rdparty/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | 3rdparty/cmake/FindMYSQL.cmake (renamed from 3rdparty/mysql/FindMYSQL.cmake) | 0 | ||||
| -rw-r--r-- | 3rdparty/cmake/FindPCRE.cmake (renamed from 3rdparty/pcre/FindPCRE.cmake) | 0 | ||||
| -rw-r--r-- | 3rdparty/mysql/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | 3rdparty/pcre/CMakeLists.txt | 1 |
5 files changed, 1 insertions, 2 deletions
diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt index 3e7cb4cc4..a63321033 100644 --- a/3rdparty/CMakeLists.txt +++ b/3rdparty/CMakeLists.txt @@ -47,6 +47,7 @@ macro( CONFIGURE_WITH_LOCAL_OR_SYSTEM name ) endmacro( CONFIGURE_WITH_LOCAL_OR_SYSTEM ) +set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${CMAKE_MODULE_PATH} ) add_subdirectory( msinttypes ) add_subdirectory( mt19937ar ) add_subdirectory( mysql ) diff --git a/3rdparty/mysql/FindMYSQL.cmake b/3rdparty/cmake/FindMYSQL.cmake index 0a07f3612..0a07f3612 100644 --- a/3rdparty/mysql/FindMYSQL.cmake +++ b/3rdparty/cmake/FindMYSQL.cmake diff --git a/3rdparty/pcre/FindPCRE.cmake b/3rdparty/cmake/FindPCRE.cmake index cb4d9177b..cb4d9177b 100644 --- a/3rdparty/pcre/FindPCRE.cmake +++ b/3rdparty/cmake/FindPCRE.cmake diff --git a/3rdparty/mysql/CMakeLists.txt b/3rdparty/mysql/CMakeLists.txt index f4996907f..e85fd626d 100644 --- a/3rdparty/mysql/CMakeLists.txt +++ b/3rdparty/mysql/CMakeLists.txt @@ -44,7 +44,6 @@ endif( WIN32 ) message( STATUS "Detecting system MYSQL" ) 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" ) diff --git a/3rdparty/pcre/CMakeLists.txt b/3rdparty/pcre/CMakeLists.txt index 70448d40e..57465a46c 100644 --- a/3rdparty/pcre/CMakeLists.txt +++ b/3rdparty/pcre/CMakeLists.txt @@ -39,7 +39,6 @@ endif( WIN32 ) # system # message( STATUS "Detecting system PCRE" ) -set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_MODULE_PATH} ) unset( PCRE_LIBRARIES CACHE ) unset( PCRE_INCLUDE_DIRS CACHE ) find_package( PCRE ) |