thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-19 14:11:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix building without submodules

Browse Source
This commit is contained in:
proller 2019-06-28 18:22:57 +03:00
parent 4db84332fa
commit 882747fde6
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/find_mimalloc.cmake
View File

@ -4,6 +4,7 @@ endif ()
if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mimalloc/include/mimalloc.h") if (NOT EXISTS "${ClickHouse_SOURCE_DIR}/contrib/mimalloc/include/mimalloc.h")
message (WARNING "submodule contrib/mimalloc is missing. to fix try run: \n git submodule update --init --recursive") message (WARNING "submodule contrib/mimalloc is missing. to fix try run: \n git submodule update --init --recursive")
return ()
endif () endif ()
if (ENABLE_MIMALLOC) if (ENABLE_MIMALLOC)

4
libs/libcommon/cmake/find_jemalloc.cmake
View File

@ -7,7 +7,7 @@ endif ()
option (ENABLE_JEMALLOC "Set to TRUE to use jemalloc" ${ENABLE_JEMALLOC_DEFAULT}) option (ENABLE_JEMALLOC "Set to TRUE to use jemalloc" ${ENABLE_JEMALLOC_DEFAULT})
if (OS_LINUX AND NOT ARCH_ARM) if (OS_LINUX AND NOT ARCH_ARM)
option (USE_INTERNAL_JEMALLOC_LIBRARY "Set to FALSE to use system jemalloc library instead of bundled" ${NOT_UNBUNDLED}) option (USE_INTERNAL_JEMALLOC_LIBRARY "Set to FALSE to use system jemalloc library instead of bundled" ${NOT_UNBUNDLED})
elseif () else()
option (USE_INTERNAL_JEMALLOC_LIBRARY "Set to FALSE to use system jemalloc library instead of bundled" OFF) option (USE_INTERNAL_JEMALLOC_LIBRARY "Set to FALSE to use system jemalloc library instead of bundled" OFF)
endif() endif()
@ -30,7 +30,7 @@ if (ENABLE_JEMALLOC)
if (JEMALLOC_LIBRARIES) if (JEMALLOC_LIBRARIES)
set (USE_JEMALLOC 1) set (USE_JEMALLOC 1)
else () elseif (NOT MISSING_INTERNAL_JEMALLOC_LIBRARY)
message (FATAL_ERROR "ENABLE_JEMALLOC is set to true, but library was not found") message (FATAL_ERROR "ENABLE_JEMALLOC is set to true, but library was not found")
endif () endif ()