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/txt-converter | |
| 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/txt-converter')
| -rw-r--r-- | src/txt-converter/char/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/txt-converter/login/CMakeLists.txt | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/txt-converter/char/CMakeLists.txt b/src/txt-converter/char/CMakeLists.txt index dab0df76a..ecdc28091 100644 --- a/src/txt-converter/char/CMakeLists.txt +++ b/src/txt-converter/char/CMakeLists.txt @@ -55,7 +55,7 @@ set( CONVERTER_SOURCES ) set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} ) -set( DEFINITIONS ${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS} TXT_SQL_CONVERT ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS} -DTXT_SQL_CONVERT" ) set( SOURCE_FILES ${COMMON_HEADERS} ${COMMON_SOURCES} ${TXT_HEADERS} ${TXT_SOURCES} ${SQL_HEADERS} ${SQL_SOURCES} ${CONVERTER_SOURCES} ) source_group( common FILES ${COMMON_HEADERS} ${COMMON_SOURCES} ) source_group( txt FILES ${TXT_HEADERS} ${TXT_SOURCES} ) @@ -64,7 +64,7 @@ source_group( converter FILES ${CONVERTER_SOURCES} ) include_directories( ${INCLUDE_DIRS} ) add_executable( char-converter ${SOURCE_FILES} ) target_link_libraries( char-converter ${LIBRARIES} ) -set_target_properties( char-converter PROPERTIES COMPILE_DEFINITIONS "${DEFINITIONS}" ) +set_target_properties( char-converter PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) if( WITH_COMPONENT_RUNTIME ) cpack_add_component( Runtime_charconverter DESCRIPTION "char-converter" DISPLAY_NAME "char-converter" GROUP Runtime ) install( TARGETS char-converter diff --git a/src/txt-converter/login/CMakeLists.txt b/src/txt-converter/login/CMakeLists.txt index 8ae7665f4..8cf333438 100644 --- a/src/txt-converter/login/CMakeLists.txt +++ b/src/txt-converter/login/CMakeLists.txt @@ -39,7 +39,7 @@ set( CONVERTER_SOURCES ) set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} ) -set( DEFINITIONS ${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS} WITH_TXT WITH_SQL ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS} -DWITH_TXT -DWITH_SQL" ) set( SOURCE_FILES ${COMMON_HEADERS} ${COMMON_SOURCES} ${TXT_HEADERS} ${TXT_SOURCES} ${SQL_HEADERS} ${SQL_SOURCES} ${CONVERTER_SOURCES} ) source_group( common FILES ${COMMON_HEADERS} ${COMMON_SOURCES} ) source_group( txt FILES ${TXT_HEADERS} ${TXT_SOURCES} ) @@ -48,7 +48,7 @@ source_group( converter FILES ${CONVERTER_SOURCES} ) include_directories( ${INCLUDE_DIRS} ) add_executable( login-converter ${SOURCE_FILES} ) target_link_libraries( login-converter ${LIBRARIES} ) -set_target_properties( login-converter PROPERTIES COMPILE_DEFINITIONS "${DEFINITIONS}" ) +set_target_properties( login-converter PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) if( WITH_COMPONENT_RUNTIME ) cpack_add_component( Runtime_loginconverter DESCRIPTION "login-converter" DISPLAY_NAME "login-converter" GROUP Runtime ) install( TARGETS login-converter |