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:
@@ -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)
|
||||||
|
|||||||
@@ -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()
|
||||||
|
|
||||||
|
|||||||
@@ -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()
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user