Buildsystem/Linux: Fix linking of a long lost little child : jemalloc (yes, it has returned, and is now actively linked again)

--HG--
branch : trunk
This commit is contained in:
click
2010-12-18 01:36:00 +01:00
parent 4a067d5095
commit 0054bd83d8
3 changed files with 7 additions and 2 deletions
+5
View File
@@ -1,3 +1,8 @@
# Package overloads - Linux
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
set(JEMALLOC_LIBRARY "jemalloc")
endif()
# set default configuration directory # set default configuration directory
if( NOT CONF_DIR ) if( NOT CONF_DIR )
set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc) set(CONF_DIR ${CMAKE_INSTALL_PREFIX}/etc)
-1
View File
@@ -17,7 +17,6 @@ endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux") if(CMAKE_SYSTEM_NAME MATCHES "Linux")
if(SERVERS) if(SERVERS)
add_subdirectory(jemalloc) add_subdirectory(jemalloc)
set(JEMALLOC_LIB "jemalloc")
endif() endif()
endif() endif()
+2 -1
View File
@@ -164,7 +164,7 @@ target_link_libraries(worldserver
collision collision
g3dlib g3dlib
gsoap gsoap
${JEMALLOC_LIB} ${JEMALLOC_LIBRARY}
${READLINE_LIBRARY} ${READLINE_LIBRARY}
${TERMCAP_LIBRARY} ${TERMCAP_LIBRARY}
${ACE_LIBRARY} ${ACE_LIBRARY}
@@ -198,3 +198,4 @@ if( USE_COREPCH )
add_native_precompiled_header(worldserver ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/worldPCH) add_native_precompiled_header(worldserver ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/worldPCH)
endif() endif()
endif() endif()