diff options
| author | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-13 17:14:43 +0000 |
|---|---|---|
| committer | eathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-13 17:14:43 +0000 |
| commit | 93dd8ad5d0d9e1888ff4b32afa1fb09dbdd80be9 (patch) | |
| tree | 9995391f4ac6aad31a4271c2440148b404d30667 /src/common | |
| parent | 7e930917355db2790835bcda2f6ae37e3ae3c05c (diff) | |
| download | hercules-93dd8ad5d0d9e1888ff4b32afa1fb09dbdd80be9.tar.gz hercules-93dd8ad5d0d9e1888ff4b32afa1fb09dbdd80be9.tar.bz2 hercules-93dd8ad5d0d9e1888ff4b32afa1fb09dbdd80be9.tar.xz hercules-93dd8ad5d0d9e1888ff4b32afa1fb09dbdd80be9.zip | |
- Full revert of r16105 and r16106.
* Merged changes up to eAthena 15094.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16110 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src/common')
| -rw-r--r-- | src/common/CMakeLists.txt | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/src/common/CMakeLists.txt b/src/common/CMakeLists.txt index f37819188..effd0b2ab 100644 --- a/src/common/CMakeLists.txt +++ b/src/common/CMakeLists.txt @@ -101,7 +101,6 @@ set( COMMON_BASE_SOURCES "${COMMON_SOURCE_DIR}/utils.c" ${LIBCONFIG_SOURCES} # needed by conf.c/showmsg.c CACHE INTERNAL "common_base sources" ) -set( DEPENDENCIES ${ZLIB_DEPENDENCIES} ) set( COMMON_BASE_INCLUDE_DIRS ${LIBCONFIG_INCLUDE_DIRS} CACHE INTERNAL "common_base include dirs" ) @@ -110,14 +109,11 @@ set( COMMON_BASE_DEFINITIONS CACHE INTERNAL "common_base definitions" ) set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MT19937AR_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_BASE_INCLUDE_DIRS} ) -set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS} ${ZLIB_DEFINITIONS}" ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_BASE_DEFINITIONS}" ) set( SOURCE_FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} ) source_group( mt19937ar FILES ${MT19937AR_HEADERS} ${MT19937AR_SOURCES} ) source_group( common FILES ${COMMON_BASE_HEADERS} ${COMMON_BASE_SOURCES} ) add_library( common_base ${SOURCE_FILES} ) -if( DEPENDENCIES ) - add_dependencies( common_base ${DEPENDENCIES} ) -endif() target_link_libraries( common_base ${LIBRARIES} ) set_target_properties( common_base PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) include_directories( ${INCLUDE_DIRS} ) @@ -142,17 +138,15 @@ set( COMMON_SQL_HEADERS set( COMMON_SQL_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/sql.c" CACHE INTERNAL "common_sql sources" ) -set( DEPENDENCIES common_base ${MYSQL_DEPENDENCIES} ) -set( LIBRARIES ${GLOBAL_LIBRARIES} common_base ${MYSQL_LIBRARIES} ) +set( DEPENDENCIES common_base ) +set( LIBRARIES ${GLOBAL_LIBRARIES} ${MYSQL_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${MYSQL_INCLUDE_DIRS} ) -set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${MYSQL_DEFINITIONS}" ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS}" ) set( SOURCE_FILES ${COMMON_SQL_HEADERS} ${COMMON_SQL_SOURCES} ) source_group( common FILES ${COMMON_SQL_HEADERS} ${COMMON_SQL_SOURCES} ) add_library( common_sql ${SOURCE_FILES} ) -if( DEPENDENCIES ) - add_dependencies( common_sql ${DEPENDENCIES} ) -endif() -target_link_libraries( common_sql ${LIBRARIES} ) +add_dependencies( common_sql ${DEPENDENCIES} ) +target_link_libraries( common_sql ${LIBRARIES} ${DEPENDENCIES} ) set_target_properties( common_sql PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) include_directories( ${INCLUDE_DIRS} ) set( HAVE_common_sql ON CACHE INTERNAL "" ) |