8000 jemalloc is not REQUIRED if explicitly requested · gauravkumar37/arangodb@b3f0a49 · GitHub
[go: up one dir, main page]
Skip to content

Commit b3f0a49

Browse files
author
Andreas Streichardt
committed
jemalloc is not REQUIRED if explicitly requested
1 parent 31f9806 commit b3f0a49

File tree

2 files changed

+7
-10
lines changed

2 files changed

+7
-10
lines changed

‎CMakeLists.txt

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,8 @@ endif ()
403403
## JEMALLOC
404404
################################################################################
405405

406-
set(JEMALLOC_DEFAULT_VALUE ON)
406+
find_package(jemalloc)
407+
set(JEMALLOC_DEFAULT_VALUE ${JEMALLOC_FOUND})
407408

408409
if (WINDOWS OR SOLARIS OR USE_TCMALLOC)
409410
set(JEMALLOC_DEFAULT_VALUE OFF)
@@ -415,15 +416,11 @@ option(USE_JEMALLOC
415416
)
416417

417418
if (USE_JEMALLOC)
418-
find_package(jemalloc)
419-
420-
if (JEMALLOC_FOUND)
421-
add_definitions("-DARANGODB_HAVE_JEMALLOC=1")
422-
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_jemalloc_LIBRARY})
423-
message(STATUS "Found JEMALLOC")
424-
else ()
425-
message(STATUS "Missing JEMALLOC")
419+
if (NOT JEMALLOC_FOUND)
420+
message(FATAL_ERROR "jemalloc build was requested but jemalloc not found")
426421
endif ()
422+
add_definitions("-DARANGODB_HAVE_JEMALLOC=1")
423+
set(SYS_LIBS ${SYS_LIBS} ${JEMALLOC_jemalloc_LIBRARY})
427424
endif ()
428425

429426
################################################################################

‎scripts/build-deb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ set -e
44

55
mkdir -p build-debian
66
cd build-debian
7-
cmake -DCMAKE_BUILD_TYPE=RelWithDebug -DCMAKE_SKIP_RPATH=On -DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off -DETCDIR=/etc -DCMAKE_INSTALL_PREFIX=/usr -DVARDIR=/var ..
7+
cmake -DCMAKE_BUILD_TYPE=RelWithDebug -DCMAKE_SKIP_RPATH=On -DUSE_OPTIMIZE_FOR_ARCHITECTURE=Off -DETCDIR=/etc -DCMAKE_INSTALL_PREFIX=/usr -DVARDIR=/var -DUSE_JEMALLOC=On ..
88
make -j12
99
cpack -G DEB --verbose
1010
cd ..

0 commit comments

Comments
 (0)
0