summaryrefslogtreecommitdiff
path: root/src/tool/CMakeLists.txt
diff options
context:
space:
mode:
authoreathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-13 17:14:43 +0000
committereathenabot <eathenabot@54d463be-8e91-2dee-dedb-b68131a5f0ec>2012-05-13 17:14:43 +0000
commit93dd8ad5d0d9e1888ff4b32afa1fb09dbdd80be9 (patch)
tree9995391f4ac6aad31a4271c2440148b404d30667 /src/tool/CMakeLists.txt
parent7e930917355db2790835bcda2f6ae37e3ae3c05c (diff)
downloadhercules-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/tool/CMakeLists.txt')
-rw-r--r--src/tool/CMakeLists.txt8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/tool/CMakeLists.txt b/src/tool/CMakeLists.txt
index 434cbbfe6..a54ffa0e2 100644
--- a/src/tool/CMakeLists.txt
+++ b/src/tool/CMakeLists.txt
@@ -24,20 +24,16 @@ 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} ${ZLIB_DEFINITIONS}" )
+set( DEFINITIONS "${GLOBAL_DEFINITIONS} ${COMMON_MINI_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} )
-if( DEPENDENCIES )
- add_dependencies( mapcache ${DEPENDENCIES} )
-endif()
+include_directories( ${INCLUDE_DIRS} )
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