From 80fcbb6ed856995f86e37ac0f6849990260e264d Mon Sep 17 00:00:00 2001 From: Willem Jan Withagen Date: Sun, 24 Jul 2016 15:48:50 +0200 Subject: [PATCH] src/CMakeLists.txt: pass compiler and flags used to compile into RocksDB build - make sure the right compiler is used in CXX - NDEBUG if the current code is not being build with debugging Signed-off-by: Willem Jan Withagen --- src/CMakeLists.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index a09ed17f5afa4..eab2ca17238be 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -637,9 +637,15 @@ install(TARGETS ceph-mon DESTINATION bin) if(NOT ALLOCATOR STREQUAL "jemalloc") set(disable_jemalloc "DISABLE_JEMALLOC=1") endif() + +set(ROCKSDB_EXTRA_CXXFLAG -fPIC -Wno-unused-variable) +if(NOT CMAKE_BUILD_TYPE STREQUAL Debug) + set(ROCKSDB_EXTRA_CXXFLAG ${ROCKSDB_EXTRA_CXXFLAG} -DNDEBUG) +endif(NOT CMAKE_BUILD_TYPE STREQUAL Debug) + add_custom_target(build_rocksdb COMMAND - PORTABLE=1 ${disable_jemalloc} $(MAKE) static_lib EXTRA_CXXFLAGS='-fPIC -Wno-unused-variable' + PORTABLE=1 ${disable_jemalloc} $(MAKE) static_lib CXX="${CMAKE_CXX_COMPILER}" EXTRA_CXXFLAGS="${ROCKSDB_EXTRA_CXXFLAG}" WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/src/rocksdb COMMENT "rocksdb building") -- 2.39.5