diff options
| author | Justin M. Keyes <justinkz@gmail.com> | 2015-04-30 10:46:01 -0400 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2015-04-30 10:46:01 -0400 |
| commit | b427dcdda286603a06ed29b45f1090894e92074a (patch) | |
| tree | 734a0759fe9f1561a86f074396ec90d6f8011562 /CMakeLists.txt | |
| parent | 45b617afada9304cb265aad02645b22d76dfc2d5 (diff) | |
| parent | 8130eb1191aece52d8b2790302abf1bd09aaf90f (diff) | |
| download | rneovim-b427dcdda286603a06ed29b45f1090894e92074a.tar.gz rneovim-b427dcdda286603a06ed29b45f1090894e92074a.tar.bz2 rneovim-b427dcdda286603a06ed29b45f1090894e92074a.zip | |
Merge pull request #2465 from fwalch/fix-jemalloc
Force je_ prefix for jemalloc functions, small CMake fixes.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 2879b57061..5e176a540d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,38 +190,25 @@ include_directories(SYSTEM ${MSGPACK_INCLUDE_DIRS}) find_package(LuaJit REQUIRED) include_directories(SYSTEM ${LUAJIT_INCLUDE_DIRS}) -option(LIBUNIBILIUM_USE_STATIC "Use static libunibilium" ON) -find_package(LibUnibilium REQUIRED) -include_directories(SYSTEM ${LIBUNIBILIUM_INCLUDE_DIRS}) +find_package(Unibilium REQUIRED) +include_directories(SYSTEM ${UNIBILIUM_INCLUDE_DIRS}) -option(LIBTERMKEY_USE_STATIC "Use static libtermkey" ON) find_package(LibTermkey REQUIRED) include_directories(SYSTEM ${LIBTERMKEY_INCLUDE_DIRS}) -option(LIBVTERM_USE_STATIC "Use static libvterm" ON) find_package(LibVterm REQUIRED) include_directories(SYSTEM ${LIBVTERM_INCLUDE_DIRS}) option(SANITIZE "Enable Clang sanitizers for nvim binary" OFF) if(SANITIZE AND NOT CMAKE_C_COMPILER_ID MATCHES "Clang") - message(WARNING "SANITIZE is only supported for Clang ... disabling") + message(WARNING "SANITIZE is only supported for Clang, disabling") set(SANITIZE OFF) endif() -if(SANITIZE) - option(USE_JEMALLOC "Use jemalloc" OFF) -else() - option(USE_JEMALLOC "Use jemalloc" ON) -endif() - -if(USE_JEMALLOC) - option(JEMALLOC_USE_STATIC "Use static jemalloc" ON) +if(NOT SANITIZE) find_package(JeMalloc) if(JEMALLOC_FOUND) - message(STATUS "Using jemalloc instead of libc allocator") include_directories(SYSTEM ${JEMALLOC_INCLUDE_DIRS}) - else() - set(USE_JEMALLOC OFF) endif() endif() |