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
This commit is contained in:
click
2010-08-11 20:55:14 +02:00
parent f482bb1cd5
commit 780ed1b01c
9 changed files with 83 additions and 39 deletions
+2 -4
View File
@@ -10,6 +10,7 @@
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
add_subdirectory(jemalloc)
set(JEMALLOC_LIB "jemalloc")
endif()
if(CMAKE_SYSTEM_NAME MATCHES "Windows")
@@ -21,7 +22,4 @@ endif()
add_subdirectory(g3dlite)
add_subdirectory(sockets)
add_subdirectory(gsoap)
# temporary disable libmpq building (through CMake at least) for now
# - needs a proper CMakeLists.txt
#add_subdirectory(libmpq)
add_subdirectory(libmpq)
+2
View File
@@ -335,3 +335,5 @@ add_library(ace SHARED ${ace_STAT_SRCS})
if(PCH)
add_native_precompiled_header(ace ${CMAKE_SOURCE_DIR}/externals/ace/PrecompiledHeaders/WinAcePCH)
endif()
install(TARGETS ace DESTINATION "${CMAKE_INSTALL_PREFIX}")