From: Kefu Chai <kchai@redhat.com>
Date: Sat, 9 Dec 2017 12:18:39 +0000 (+0800)
Subject: cmake: disable FAIL_ON_WARNINGS for rocksdb
X-Git-Tag: v12.2.6~94^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F22076%2Fhead;p=ceph.git

cmake: disable FAIL_ON_WARNINGS for rocksdb

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.
---

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 7aa8a4392e1..1b925a70fc8 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.