]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
cmake: disable FAIL_ON_WARNINGS for rocksdb 22076/head
authorKefu Chai <kchai@redhat.com>
Sat, 9 Dec 2017 12:18:39 +0000 (20:18 +0800)
committerKefu Chai <kchai@redhat.com>
Fri, 18 May 2018 05:50:02 +0000 (13:50 +0800)
otherwise -Werror=implicit-fallthrough will fail the build with GCC-7

Signed-off-by: Kefu Chai <kchai@redhat.com>
(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

index 7aa8a4392e1e2a7d1258fc1278adbcc2ee66208f..1b925a70fc8b00a2eed8bbd650371acc924c1d8d 100644 (file)
@@ -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.