From 900a475da9a080c96e48477d0a4488e92a1ec2f9 Mon Sep 17 00:00:00 2001 From: Steve Gerbino Date: Mon, 23 Sep 2019 16:32:05 -0400 Subject: [PATCH 1/2] Disable strict warnings introduced with Clang 8 --- libraries/vendor/rocksdb/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libraries/vendor/rocksdb/CMakeLists.txt b/libraries/vendor/rocksdb/CMakeLists.txt index 40cdd26bb6..d1ec65d762 100644 --- a/libraries/vendor/rocksdb/CMakeLists.txt +++ b/libraries/vendor/rocksdb/CMakeLists.txt @@ -260,7 +260,7 @@ if(FAIL_ON_WARNINGS) if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") else() # assume GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=shadow -Wno-error=defaulted-function-deleted") endif() endif() From 13ab7082eadd7da63afe6a3e82cff70099ef02cd Mon Sep 17 00:00:00 2001 From: Steve Gerbino Date: Mon, 23 Sep 2019 17:12:36 -0400 Subject: [PATCH 2/2] Only apply no-error defaulted-function-deleted on Clang builds --- libraries/vendor/rocksdb/CMakeLists.txt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/vendor/rocksdb/CMakeLists.txt b/libraries/vendor/rocksdb/CMakeLists.txt index d1ec65d762..20d876b874 100644 --- a/libraries/vendor/rocksdb/CMakeLists.txt +++ b/libraries/vendor/rocksdb/CMakeLists.txt @@ -260,7 +260,10 @@ if(FAIL_ON_WARNINGS) if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX") else() # assume GCC - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=shadow -Wno-error=defaulted-function-deleted") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror -Wno-error=shadow") + if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=defaulted-function-deleted") + endif() endif() endif()