aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2015-10-26 18:40:07 -0400
committerJustin M. Keyes <justinkz@gmail.com>2015-10-26 18:40:07 -0400
commit95707bf336794c7ec8991917f184c02ae873dd8c (patch)
tree018751ebdd7d4ea7e857fb6564a7be416ff45d24
parentf17c6482f255cc80d422caede8d36965a7a721d4 (diff)
parent2bcfd7fde19bf43eeae6518ca1e6f92cf6609485 (diff)
downloadrneovim-95707bf336794c7ec8991917f184c02ae873dd8c.tar.gz
rneovim-95707bf336794c7ec8991917f184c02ae873dd8c.tar.bz2
rneovim-95707bf336794c7ec8991917f184c02ae873dd8c.zip
Merge pull request #3515 from Tranquility/make_jemalloc_optional
Make jemalloc optional
-rw-r--r--CMakeLists.txt16
1 files changed, 10 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 348e138a06..53e387307c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -260,12 +260,16 @@ 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.")
endif()
-if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
- message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
-else()
- find_package(JeMalloc)
- if(JEMALLOC_FOUND)
- include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
+option(ENABLE_JEMALLOC "enable jemalloc" OFF)
+
+if (ENABLE_JEMALLOC)
+ if(CLANG_ASAN_UBSAN OR CLANG_MSAN OR CLANG_TSAN)
+ message(STATUS "Sanitizers have been enabled; don't use jemalloc.")
+ else()
+ find_package(JeMalloc)
+ if(JEMALLOC_FOUND)
+ include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS})
+ endif()
endif()
endif()