diff options
| author | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-12 06:39:46 +0000 |
|---|---|---|
| committer | flaviojs <flaviojs@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2011-07-12 06:39:46 +0000 |
| commit | 9349df4e5fa122fd74d632d4227f8c1a1f32c36d (patch) | |
| tree | b9789c4d58ffb21ae92ff4325fd32fa4bde38ae9 /src/map | |
| parent | 3f04b3aa7a2ff0c7266f53ead689d9ea81ce5ef7 (diff) | |
| download | hercules-9349df4e5fa122fd74d632d4227f8c1a1f32c36d.tar.gz hercules-9349df4e5fa122fd74d632d4227f8c1a1f32c36d.tar.bz2 hercules-9349df4e5fa122fd74d632d4227f8c1a1f32c36d.tar.xz hercules-9349df4e5fa122fd74d632d4227f8c1a1f32c36d.zip | |
* CMake: set project language to C, added module FindFunctionLibrary, added search for dl library. (tested with debian-wheezy-i386)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@14902 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/map')
| -rw-r--r-- | src/map/sql/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | src/map/txt/CMakeLists.txt | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/src/map/sql/CMakeLists.txt b/src/map/sql/CMakeLists.txt index ae16148d4..591e3e65b 100644 --- a/src/map/sql/CMakeLists.txt +++ b/src/map/sql/CMakeLists.txt @@ -80,12 +80,12 @@ set( SQL_MAP_SOURCES set( DEPENDENCIES common_sql ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ) -set( DEFINITIONS ${GLOBAL_DEFINITIONS} ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS}" ) if( WITH_PCRE ) message( STATUS "Using PCRE" ) - list( APPEND LIBRARIES ${PCRE_LIBRARIES} ) - list( APPEND INCLUDE_DIRS ${PCRE_INCLUDE_DIRS} ) - list( APPEND DEFINITIONS PCRE_SUPPORT ) + set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} ) + set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} ) + set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" ) endif() set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ${SQL_MAP_HEADERS} ${SQL_MAP_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_SQL_HEADERS} ) @@ -94,7 +94,7 @@ 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} ) -set_target_properties( map-server_sql PROPERTIES COMPILE_DEFINITIONS "${DEFINITIONS}" ) +set_target_properties( map-server_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) if( WITH_COMPONENT_RUNTIME ) cpack_add_component( Runtime_mapserver_sql DESCRIPTION "map-server (sql version)" DISPLAY_NAME "map-server_sql" GROUP Runtime ) install( TARGETS map-server_sql diff --git a/src/map/txt/CMakeLists.txt b/src/map/txt/CMakeLists.txt index 4e3bfbb0c..878ab68d2 100644 --- a/src/map/txt/CMakeLists.txt +++ b/src/map/txt/CMakeLists.txt @@ -80,12 +80,12 @@ set( TXT_MAP_SOURCES set( DEPENDENCIES common_base ) set( LIBRARIES ${GLOBAL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ) -set( DEFINITIONS ${GLOBAL_DEFINITIONS} TXT_ONLY ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS} -DTXT_ONLY" ) if( WITH_PCRE ) message( STATUS "Using PCRE" ) - list( APPEND LIBRARIES ${PCRE_LIBRARIES} ) - list( APPEND INCLUDE_DIRS ${PCRE_INCLUDE_DIRS} ) - list( APPEND DEFINITIONS PCRE_SUPPORT ) + set( LIBRARIES ${LIBRARIES} ${PCRE_LIBRARIES} ) + set( INCLUDE_DIRS ${INCLUDE_DIRS} ${PCRE_INCLUDE_DIRS} ) + set( DEFINITIONS "${DEFINITIONS} -DPCRE_SUPPORT" ) endif() set( SOURCE_FILES ${COMMON_BASE_HEADERS} ${TXT_MAP_HEADERS} ${TXT_MAP_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ) @@ -94,7 +94,7 @@ include_directories( ${INCLUDE_DIRS} ) add_executable( map-server ${SOURCE_FILES} ) add_dependencies( map-server ${DEPENDENCIES} ) target_link_libraries( map-server ${LIBRARIES} ${DEPENDENCIES} ) -set_target_properties( map-server PROPERTIES COMPILE_DEFINITIONS "${DEFINITIONS}" ) +set_target_properties( map-server PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) if( WITH_COMPONENT_RUNTIME ) cpack_add_component( Runtime_mapserver_txt DESCRIPTION "map-server (txt version)" DISPLAY_NAME "map-server" GROUP Runtime ) install( TARGETS map-server |