diff options
| -rw-r--r-- | cmake/platform/unix/settings.cmake | 4 | ||||
| -rw-r--r-- | cmake/showoptions.cmake | 8 | ||||
| -rw-r--r-- | dep/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/server/worldserver/CMakeLists.txt | 1 |
4 files changed, 12 insertions, 5 deletions
diff --git a/cmake/platform/unix/settings.cmake b/cmake/platform/unix/settings.cmake index 81f438befc9..dd8b7c081f3 100644 --- a/cmake/platform/unix/settings.cmake +++ b/cmake/platform/unix/settings.cmake @@ -1,6 +1,8 @@ # Package overloads - Linux if(CMAKE_SYSTEM_NAME MATCHES "Linux") - set(JEMALLOC_LIBRARY "jemalloc") + if (NOT NOJEM) + set(JEMALLOC_LIBRARY "jemalloc") + endif() endif() # set default configuration directory diff --git a/cmake/showoptions.cmake b/cmake/showoptions.cmake index 31e1b412b32..9cac1d82f4a 100644 --- a/cmake/showoptions.cmake +++ b/cmake/showoptions.cmake @@ -78,4 +78,10 @@ if( WIN32 ) endif() endif( WIN32 ) -message("") +if ( NOJEM ) + message("") + message("*** WARNING: jemalloc linking has been disabled!") + message("*** Please note that this is for DEBUGGING WITH VALGRIND only!") + message("*** DO NOT DISABLE IT UNLESS YOU KNOW WHAT YOU'RE DOING!") +endif() + message("") diff --git a/dep/CMakeLists.txt b/dep/CMakeLists.txt index 9c13ad59bc5..d658ba43ffe 100644 --- a/dep/CMakeLists.txt +++ b/dep/CMakeLists.txt @@ -15,8 +15,8 @@ elseif( MSVC ) endif() if(CMAKE_SYSTEM_NAME MATCHES "Linux") - if(SERVERS) - add_subdirectory(jemalloc) + if(SERVERS AND NOT NOJEM) + add_subdirectory(jemalloc) endif() endif() diff --git a/src/server/worldserver/CMakeLists.txt b/src/server/worldserver/CMakeLists.txt index b75dfcfc064..28aab37d1dd 100644 --- a/src/server/worldserver/CMakeLists.txt +++ b/src/server/worldserver/CMakeLists.txt @@ -201,4 +201,3 @@ if( USE_COREPCH ) add_native_precompiled_header(worldserver ${CMAKE_CURRENT_SOURCE_DIR}/PrecompiledHeaders/worldPCH) endif() endif() - |