From 780ed1b01c77ac142e1da5851ff7deb832413b11 Mon Sep 17 00:00:00 2001 From: click Date: Wed, 11 Aug 2010 20:55:14 +0200 Subject: Buildsystem: Clean up build-process on all platforms - Windows: Use CMAKE_INSTALL_PREFIX as a 'final install' directory (thanks to paradox for the preload-handling) (New target INSTALL, -not- included as part of ALL_BUILD (must be specifically run for installation to start) - All: Build libmpq library (used for tools) - All: Build extractiontools with hardlinked mpq-library (no need to install it anymore) - All: Move jemalloc from being harddefined to using a CMake string (fixes issue 3378) (thanks to tru.bazoozoo for the idea, alternative added) --HG-- branch : trunk --- src/tools/map_extractor/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'src/tools/map_extractor') diff --git a/src/tools/map_extractor/CMakeLists.txt b/src/tools/map_extractor/CMakeLists.txt index 0d35421b9ef..ef333e9b285 100644 --- a/src/tools/map_extractor/CMakeLists.txt +++ b/src/tools/map_extractor/CMakeLists.txt @@ -13,6 +13,7 @@ file(GLOB_RECURSE sources *.cpp *.h) include_directories ( ${CMAKE_SOURCE_DIR}/src/server/shared + ${CMAKE_SOURCE_DIR}/externals/libmpq ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/loadlib ) @@ -23,16 +24,22 @@ add_executable(mapextractor if(WIN32) target_link_libraries(mapextractor - mpq bzip2 + zlib + mpq ) else() target_link_libraries(mapextractor - mpq ${BZIP2_LIBRARIES} + ${ZLIB_LIBRARIES} + mpq ) endif() +add_dependencies(mapextractor mpq) + if( UNIX ) install(TARGETS mapextractor DESTINATION bin) +elseif( WIN32 ) + install(TARGETS mapextractor DESTINATION "${CMAKE_INSTALL_PREFIX}") endif() -- cgit v1.2.3