diff options
| author | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
|---|---|---|
| committer | ai4rei <ai4rei@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-10-07 21:35:12 +0000 |
| commit | 033373a5a75599f8607107cb28b97cc6a653b0b5 (patch) | |
| tree | c520e925018ac7de37d05f690d357fcf55b56ec4 /src/char_sql/CMakeLists.txt | |
| parent | 692dd1e5737b01ef26ba889f60d013cb992c3cec (diff) | |
| download | hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.gz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.bz2 hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.tar.xz hercules-033373a5a75599f8607107cb28b97cc6a653b0b5.zip | |
* Merged changes from trunk [14895:14966/trunk].
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/branches/renewal@14967 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/char_sql/CMakeLists.txt')
| -rw-r--r-- | src/char_sql/CMakeLists.txt | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/char_sql/CMakeLists.txt b/src/char_sql/CMakeLists.txt index f2d1cd0f0..823939393 100644 --- a/src/char_sql/CMakeLists.txt +++ b/src/char_sql/CMakeLists.txt @@ -1,8 +1,14 @@ # +# setup +# +set( SQL_CHAR_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR} CACHE INTERNAL "" ) + + +# # char sql # -if( HAVE_common_sql ) +if( BUILD_SQL_SERVERS ) message( STATUS "Creating target char-server_sql" ) set( SQL_CHAR_HEADERS "${CMAKE_CURRENT_SOURCE_DIR}/char.h" @@ -33,7 +39,7 @@ set( SQL_CHAR_SOURCES set( DEPENDENCIES common_sql ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ) -set( DEFINITIONS ${GLOBAL_DEFINITIONS} ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS}" ) set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_CHAR_HEADERS} ${SQL_CHAR_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ) source_group( char FILES ${SQL_CHAR_HEADERS} ${SQL_CHAR_SOURCES} ) @@ -41,17 +47,12 @@ include_directories( ${INCLUDE_DIRS} ) add_executable( char-server_sql ${SOURCE_FILES} ) add_dependencies( char-server_sql ${DEPENDENCIES} ) target_link_libraries( char-server_sql ${LIBRARIES} ${DEPENDENCIES} ) -set_target_properties( char-server_sql PROPERTIES COMPILE_DEFINITIONS "${DEFINITIONS}" ) -if( WITH_COMPONENT_RUNTIME ) +set_target_properties( char-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) +if( INSTALL_COMPONENT_RUNTIME ) cpack_add_component( Runtime_charserver_sql DESCRIPTION "char-server (sql version)" DISPLAY_NAME "char-server_sql" GROUP Runtime ) install( TARGETS char-server_sql DESTINATION "." COMPONENT Runtime_charserver_sql ) -endif() +endif( INSTALL_COMPONENT_RUNTIME ) message( STATUS "Creating target char-server_sql - done" ) -set( HAVE_char-server_sql ON CACHE BOOL "char-server_sql target is available" ) -mark_as_advanced( HAVE_char-server_sql ) -else() -message( STATUS "Skipping target char-server_sql (requires common_sql)" ) -unset( HAVE_char-server_sql CACHE ) -endif() +endif( BUILD_SQL_SERVERS ) |