From 13b525114030f24bb5caf4abfdee43ea95f23805 Mon Sep 17 00:00:00 2001 From: William Hyun Date: Sat, 12 Jun 2021 16:23:34 -0700 Subject: [PATCH 1/3] ORC-815: Build and test C++ module on CLang12 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index fce4812815..aaf6c02474 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set (WARN_FLAGS "${WARN_FLAGS} -Wconversion") if (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "11.0") - set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat -Wno-suggest-override -Wno-suggest-destructor-override") endif () if (STOP_BUILD_ON_WARNING) set (WARN_FLAGS "${WARN_FLAGS} -Werror") From d4f23c1cf70e2e13597b4a9c562a57dae8962957 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sat, 12 Jun 2021 17:11:29 -0700 Subject: [PATCH 2/3] Split clang 12 and 11 --- CMakeLists.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aaf6c02474..da4146a56f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -97,8 +97,10 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set (WARN_FLAGS "${WARN_FLAGS} -Wno-missing-noreturn -Wno-unknown-pragmas") set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set (WARN_FLAGS "${WARN_FLAGS} -Wconversion") - if (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "11.0") + if (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "12.0") set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat -Wno-suggest-override -Wno-suggest-destructor-override") + elseif (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "11.0") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat") endif () if (STOP_BUILD_ON_WARNING) set (WARN_FLAGS "${WARN_FLAGS} -Werror") From 4291a3eff5c96fe739b54e874bfd99e185966007 Mon Sep 17 00:00:00 2001 From: Dongjoon Hyun Date: Sat, 12 Jun 2021 18:39:01 -0700 Subject: [PATCH 3/3] Add -Wno-unknown-warning-option --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index da4146a56f..9b7e7801d5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -98,7 +98,7 @@ if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang") set (WARN_FLAGS "${WARN_FLAGS} -Wno-gnu-zero-variadic-macro-arguments") set (WARN_FLAGS "${WARN_FLAGS} -Wconversion") if (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "12.0") - set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat -Wno-suggest-override -Wno-suggest-destructor-override") + set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat -Wno-unknown-warning-option -Wno-suggest-override -Wno-suggest-destructor-override") elseif (CMAKE_HOST_APPLE AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER "11.0") set (WARN_FLAGS "${WARN_FLAGS} -Wno-c++2a-compat") endif ()