diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-11 02:37:53 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-11 02:37:53 +0000 |
| commit | 2402a9a0a5a654a3a3c8f5b22dd1cf0cf4a2f3f9 (patch) | |
| tree | 474ad9b1fbffd707166ba468a3a1ffa51f44ca47 /CMakeLists.txt | |
| parent | a96c4a26bef0595b083baeaa6454d3a980001ac9 (diff) | |
| download | hercules-2402a9a0a5a654a3a3c8f5b22dd1cf0cf4a2f3f9.tar.gz hercules-2402a9a0a5a654a3a3c8f5b22dd1cf0cf4a2f3f9.tar.bz2 hercules-2402a9a0a5a654a3a3c8f5b22dd1cf0cf4a2f3f9.tar.xz hercules-2402a9a0a5a654a3a3c8f5b22dd1cf0cf4a2f3f9.zip | |
* Merged changes up to eAthena 15094.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16096 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 24 |
1 files changed, 17 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index fdbfb1d7f..83e021fc3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -70,7 +70,7 @@ endif() # # 3rd party # -add_subdirectory( 3rdparty ) +set( CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/cmake CACHE INTERNAL "" ) include( CheckCSourceCompiles ) include( CheckCSourceRuns ) include( CheckIncludeFile ) @@ -115,7 +115,10 @@ if( SVNVERSION_EXECUTABLE ) execute_process( COMMAND ${SVNVERSION_EXECUTABLE} ${PROJECT_SOURCE_DIR} OUTPUT_VARIABLE SVNVERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) - string( REGEX REPLACE "[^1234567890MSexported]" "_" SVNVERSION ${SVNVERSION} ) + if( SVNVERSION MATCHES "^Unversioned" ) + set( SVNVERSION ) + endif() + string( REGEX REPLACE "[^1234567890MSexported]" "_" SVNVERSION "${SVNVERSION}" ) message( STATUS "Found version: ${SVNVERSION}" ) message( STATUS "Getting svn version - done" ) endif() @@ -494,11 +497,17 @@ else() DESTINATION "." COMPONENT Runtime_base ) foreach( DIR IN ITEMS ${RUNTIME_DIRECTORIES} ) - install( DIRECTORY "${DIR}/" - DESTINATION "${DIR}" - COMPONENT Runtime_base - PATTERN ${SVN_FOLDER_PATTERN} EXCLUDE - PATTERN "conf/import-tmpl" EXCLUDE ) + if( EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/${DIR}/" ) + install( DIRECTORY "${DIR}/" + DESTINATION "${DIR}" + COMPONENT Runtime_base + PATTERN ${SVN_FOLDER_PATTERN} EXCLUDE + PATTERN "conf/import-tmpl" EXCLUDE ) + else() + # create empty directory + install( CODE "file(MAKE_DIRECTORY \"\${ENV}\${CMAKE_INSTALL_PREFIX}/${DIR}\")" + COMPONENT Runtime_base ) + endif() endforeach() endif( INSTALL_COMPONENT_RUNTIME ) if( INSTALL_COMPONENT_DEVELOPMENT ) @@ -556,6 +565,7 @@ endif( INSTALL_COMPONENT_RUNTIME ) # sources # set( TARGET_LIST CACHE INTERNAL "" ) +add_subdirectory( 3rdparty ) add_subdirectory( src ) |