Skip to content

Commit 39c5259

Browse files
authored
Merge pull request #705 from LLNL/pr-from-fork/704
Pr from fork/704
2 parents 9cfe8ae + a4c5037 commit 39c5259

File tree

2 files changed

+17
-0
lines changed

2 files changed

+17
-0
lines changed

thirdparty_builtin/benchmark-1.8.0/CMakeLists.txt

+3
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,9 @@ else()
192192
# See #631 for rationale.
193193
add_cxx_compiler_flag(-wd1786)
194194
endif()
195+
if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
196+
add_cxx_compiler_flag(-Wno-tautological-compare)
197+
endif()
195198
# Disable deprecation warnings for release builds (when -Werror is enabled).
196199
if(BENCHMARK_ENABLE_WERROR)
197200
add_cxx_compiler_flag(-Wno-deprecated)
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
diff --git a/thirdparty_builtin/benchmark-1.8.0/CMakeLists.txt b/thirdparty_builtin/benchmark-1.8.0/CMakeLists.txt
2+
index 0dbf393..5870dfc 100644
3+
--- a/thirdparty_builtin/benchmark-1.8.0/CMakeLists.txt
4+
+++ b/thirdparty_builtin/benchmark-1.8.0/CMakeLists.txt
5+
@@ -192,6 +192,9 @@ else()
6+
# See #631 for rationale.
7+
add_cxx_compiler_flag(-wd1786)
8+
endif()
9+
+ if (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
10+
+ add_cxx_compiler_flag(-Wno-tautological-compare)
11+
+ endif()
12+
# Disable deprecation warnings for release builds (when -Werror is enabled).
13+
if(BENCHMARK_ENABLE_WERROR)
14+
add_cxx_compiler_flag(-Wno-deprecated)

0 commit comments

Comments
 (0)