diff options
| author | click <none@none> | 2010-12-18 01:36:00 +0100 |
|---|---|---|
| committer | click <none@none> | 2010-12-18 01:36:00 +0100 |
| commit | 0054bd83d8bc5f773f2df3a1985b4651a2097ce8 (patch) | |
| tree | 10c04892315fe5ccf7d3eb763e9c4ba4c2fd6678 | |
| parent | 4a067d5095f4593ee1df8e4e16565ee6f213c9b8 (diff) | |
Buildsystem/Linux: Fix linking of a long lost little child : jemalloc (yes, it has returned, and is now actively linked again)
--HG--
branch : trunk
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 5 | ||||
| -rw-r--r-- | dep/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 3 |
3 files changed, 7 insertions, 2 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 27c370c740e..81f438befc9 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -1,3 +1,8 @@ +# Package overloads - Linux +if(CMAKE_SYSTEM_NAME MATCHES "Linux") + set(JEMALLOC_LIBRARY "jemalloc") +endif() + # set default configuration directory if( NOT CONF_DIR ) set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index 8332d1b1546..3e4060af446 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -17,7 +17,6 @@ endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") if(SERVERS) add_subdirectory(jemalloc) - set(JEMALLOC_LIB "jemalloc") endif() endif() diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index c3d663b7562..ceba96b8b89 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -164,7 +164,7 @@ target_link_libraries(worldserver collision g3dlib gsoap - ${JEMALLOC_LIB} + ${JEMALLOC_LIBRARY} ${READLINE_LIBRARY} ${TERMCAP_LIBRARY} ${ACE_LIBRARY} @@ -198,3 +198,4 @@ if( USE_COREPCH ) add_native_precompiled_header(worldserver ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/worldPCH) endif() endif() + |