Merge pull request #708 from LLNL/bugfix/white238/nan_gtest

Add warning flag to silence warning promoted to error in IntelLLVM
LLNL · Oct 21, 2024 · 5468efd · 5468efd
2 parents 1b076eb + 0e2a9d8
commit 5468efd
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 0 deletions.
diff --git a/RELEASE-NOTES.md b/RELEASE-NOTES.md
@@ -24,6 +24,8 @@ The project release numbers follow [Semantic Versioning](http://semver.org/spec/
 - Guard HIP C smoketest against projects that don't enable C as a language in their projects.
 - Changes benchmark custom target `run_benchmarks` to exclusively run benchmarks (not other general tests).
 - Fix HIP smoketests to fail on HIP errors.
+- Add `-Wno-tautological-compare` to GoogleTest/Mock/Benchmark for IntelLLVM compilers to silence
+  warning.
 
 ## [Version 0.6.2] - Release date 2024-03-15
 

diff --git a/thirdparty_builtin/googletest/googletest/cmake/internal_utils.cmake b/thirdparty_builtin/googletest/googletest/cmake/internal_utils.cmake
@@ -134,6 +134,8 @@ macro(config_compiler_and_linker)
     set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0")
     # RTTI can not be disabled in HP aCC compiler.
     set(cxx_no_rtti_flags "")
+  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
+    set(cxx_base_flags "-Wno-tautological-compare")
   endif()
 
   # The pthreads library is available and allowed?

diff --git a/...rk-2024_06_19-remove_gnuinstalldirs.patch → ...rk-2024-06-19-remove_gnuinstalldirs.patch b/...rk-2024_06_19-remove_gnuinstalldirs.patch → ...rk-2024-06-19-remove_gnuinstalldirs.patch
diff --git a/...st-2024_06_19-remove_gnuinstalldirs.patch → ...st-2024-06-19-remove_gnuinstalldirs.patch b/...st-2024_06_19-remove_gnuinstalldirs.patch → ...st-2024-06-19-remove_gnuinstalldirs.patch
diff --git a/thirdparty_builtin/patches/gtest-2024-10-18-suppress-tautological-intel-llvm.patch b/thirdparty_builtin/patches/gtest-2024-10-18-suppress-tautological-intel-llvm.patch
@@ -0,0 +1,13 @@
+diff --git a/thirdparty_builtin/googletest/googletest/cmake/internal_utils.cmake b/thirdparty_builtin/googletest/googletest/cmake/internal_utils.cmake
+index 6ddb794..0037804 100644
+--- a/thirdparty_builtin/googletest/googletest/cmake/internal_utils.cmake
++++ b/thirdparty_builtin/googletest/googletest/cmake/internal_utils.cmake
+@@ -134,6 +134,8 @@ macro(config_compiler_and_linker)
+     set(cxx_no_exception_flags "+noeh -DGTEST_HAS_EXCEPTIONS=0")
+     # RTTI can not be disabled in HP aCC compiler.
+     set(cxx_no_rtti_flags "")
++  elseif (CMAKE_CXX_COMPILER_ID STREQUAL "IntelLLVM")
++    set(cxx_base_flags "-Wno-tautological-compare")
+   endif()
+
+   # The pthreads library is available and allowed?