From 8d0203331af62c05b604479a15b826469536752f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sat, 9 Dec 2017 20:18:39 +0800 Subject: [PATCH] cmake: disable FAIL_ON_WARNINGS for rocksdb otherwise -Werror=implicit-fallthrough will fail the build with GCC-7 Signed-off-by: Kefu Chai (cherry picked from commit 6559a850512ddefef384d2733823ac2cb8027e3a) Conflicts: cmake/modules/BuildRocksDB.cmake: we have not extract the BuildRocksDB to this cmake module yet in luminous. so update src/CMakeLists.txt instead. --- src/CMakeLists.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 7aa8a4392e1e2..1b925a70fc8b0 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -824,10 +824,7 @@ if (NOT WITH_SYSTEM_ROCKSDB) # rocksdb/util/crc32c.cc. list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_AR=${CMAKE_AR}) list(APPEND ROCKSDB_CMAKE_ARGS -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE}) - - if (CMAKE_CXX_COMPILER_ID STREQUAL Clang) - list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF) - endif() + list(APPEND ROCKSDB_CMAKE_ARGS -DFAIL_ON_WARNINGS=OFF) # we use an external project and copy the sources to bin directory to ensure # that object files are built outside of the source tree. -- 2.39.5