Commit 8276c593 authored by Rich Prohaska's avatar Rich Prohaska

#244 silently skip jemalloc if it does not exist in the third_party directory

parent 3845c29c
...@@ -3,9 +3,7 @@ include(ExternalProject) ...@@ -3,9 +3,7 @@ include(ExternalProject)
if (NOT DEFINED LIBJEMALLOC) if (NOT DEFINED LIBJEMALLOC)
## add jemalloc with an external project ## add jemalloc with an external project
set(JEMALLOC_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/jemalloc" CACHE FILEPATH "Where to find jemalloc sources.") set(JEMALLOC_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/jemalloc" CACHE FILEPATH "Where to find jemalloc sources.")
if (NOT EXISTS "${JEMALLOC_SOURCE_DIR}/configure") if (EXISTS "${JEMALLOC_SOURCE_DIR}/configure")
message(FATAL_ERROR "Can't find jemalloc sources. Please check them out to ${JEMALLOC_SOURCE_DIR} or modify JEMALLOC_SOURCE_DIR.")
endif ()
set(jemalloc_configure_opts "CC=${CMAKE_C_COMPILER}" "--with-jemalloc-prefix=" "--with-private-namespace=tokudb_jemalloc_internal_" "--enable-cc-silence") set(jemalloc_configure_opts "CC=${CMAKE_C_COMPILER}" "--with-jemalloc-prefix=" "--with-private-namespace=tokudb_jemalloc_internal_" "--enable-cc-silence")
option(JEMALLOC_DEBUG "Build jemalloc with --enable-debug." OFF) option(JEMALLOC_DEBUG "Build jemalloc with --enable-debug." OFF)
if (JEMALLOC_DEBUG) if (JEMALLOC_DEBUG)
...@@ -33,6 +31,7 @@ if (NOT DEFINED LIBJEMALLOC) ...@@ -33,6 +31,7 @@ if (NOT DEFINED LIBJEMALLOC)
install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/jemalloc/lib" DESTINATION . install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/jemalloc/lib" DESTINATION .
COMPONENT tokukv_libs_extra) COMPONENT tokukv_libs_extra)
endif () endif ()
endif ()
endif () endif ()
## add lzma with an external project ## add lzma with an external project
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment