diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-12 20:14:01 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-12 20:14:01 +0000 |
| commit | 2a28e9c80e2386961db84f5ce932b1e33f43b7b3 (patch) | |
| tree | f83f743fcc1296e8e52ae78adcd6b9899024e07b /src/map/sql | |
| parent | a56813476c822a9cf7a543a9e419255b70680bf0 (diff) | |
| download | hercules-2a28e9c80e2386961db84f5ce932b1e33f43b7b3.tar.gz hercules-2a28e9c80e2386961db84f5ce932b1e33f43b7b3.tar.bz2 hercules-2a28e9c80e2386961db84f5ce932b1e33f43b7b3.tar.xz hercules-2a28e9c80e2386961db84f5ce932b1e33f43b7b3.zip | |
* Merged changes up to eAthena 15095.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16105 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map/sql')
| -rw-r--r-- | src/map/sql/CMakeLists.txt | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt index 47c8e495c..bf2d7cefa 100644 --- a/src/map/sql/CMakeLists.txt +++ b/src/map/sql/CMakeLists.txt @@ -82,14 +82,15 @@ set( SQL_MAP_SOURCES "${SQL_MAP_SOURCE_DIR}/vending.c" ) set( DEPENDENCIES common_sql ) -set( LIBRARIES ${GLOBAL_LIBRARIES} ) +set( LIBRARIES ${GLOBAL_LIBRARIES} common_sql ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ) set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" ) if( WITH_PCRE ) message( STATUS "Enabled PCRE code" ) + set( DEPENDENCIES ${DEPENDENCIES} ${PCRE_DEPENDENCIES} ) set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} ) set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} ) - set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" ) + set( DEFINITIONS "${DEFINITIONS} ${PCRE_DEFINITIONS} -DPCRE_SUPPORT" ) else() message( STATUS "Disabled PCRE code" ) endif() @@ -98,8 +99,10 @@ source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ) source_group( map FILES ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} ) include_directories( ${INCLUDE_DIRS} ) add_executable( map-server_sql ${SOURCE_FILES} ) -add_dependencies( map-server_sql ${DEPENDENCIES} ) -target_link_libraries( map-server_sql ${LIBRARIES} ${DEPENDENCIES} ) +if( DEPENDENCIES ) + add_dependencies( map-server_sql ${DEPENDENCIES} ) +endif() +target_link_libraries( map-server_sql ${LIBRARIES} ) set_target_properties( map-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) if( INSTALL_COMPONENT_RUNTIME ) cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server_sql" GROUP Runtime ) |