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/tool | |
| 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/tool')
| -rw-r--r-- | src/tool/CMakeLists.txt | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/tool/CMakeLists.txt b/src/tool/CMakeLists.txt index a54ffa0e2..434cbbfe6 100644 --- a/src/tool/CMakeLists.txt +++ b/src/tool/CMakeLists.txt @@ -24,16 +24,20 @@ set( COMMON_SOURCES set( MAPCACHE_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/mapcache.c" ) +set( DEPENDENCIES ${ZLIB_DEPENDENCIES} ) set( LIBRARIES ${GLOBAL_LIBRARIES} ${ZLIB_LIBRARIES} ) set( INCLUDE_DIRS ${GLOBAL_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS} ${COMMON_MINI_INCLUDE_DIRS} ) -set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS}" ) +set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_MINI_DEFINITIONS} ${ZLIB_DEFINITIONS}" ) set( SOURCE_FILES ${COMMON_HEADERS} ${COMMON_SOURCES} ${MAPCACHE_SOURCES} ) source_group( common FILES ${COMMON_HEADERS} ${COMMON_SOURCES} ) source_group( mapcache FILES ${MAPCACHE_SOURCES} ) add_executable( mapcache ${SOURCE_FILES} ) -include_directories( ${INCLUDE_DIRS} ) +if( DEPENDENCIES ) + add_dependencies( mapcache ${DEPENDENCIES} ) +endif() target_link_libraries( mapcache ${LIBRARIES} ) set_target_properties( mapcache PROPERTIES COMPILE_FLAGS "${DEFINITIONS}" ) +include_directories( ${INCLUDE_DIRS} ) if( INSTALL_COMPONENT_RUNTIME ) cpack_add_component( Runtime_mapcache DESCRIPTION "mapcache generator" DISPLAY_NAME "mapcache" GROUP Runtime ) install( TARGETS mapcache |