Merge pull request #3515 from Tranquility/make_jemalloc_optional

Make jemalloc optional
This commit is contained in:
Justin M. Keyes
2015-10-26 18:40:07 -04:00

View File

@@ -260,6 +260,9 @@ if((CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) AND NOT CMAKE_C_COMPILER_ID MA
message(FATAL_ERROR "Sanitizers are only supported for Clang.") message(FATAL_ERROR "Sanitizers are only supported for Clang.")
endif() endif()
option(ENABLE_JEMALLOC "enable jemalloc" OFF)
if (ENABLE_JEMALLOC)
if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN) if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
message(STATUS "Sanitizers have been enabled; don't use jemalloc.") message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
else() else()
@@ -268,6 +271,7 @@ else()
include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
endif() endif()
endif() endif()
endif()
find_package(LibIntl) find_package(LibIntl)
if(LibIntl_FOUND) if(LibIntl_FOUND)