#1602: CMake: handle warning related options in one place

DARMA-tasking · Nov 23, 2021 · e851266 · e851266
1 parent 419599e
commit e851266
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 11 deletions.
diff --git a/cmake-modules/SetCXXCompilerFlags.cmake b/cmake-modules/SetCXXCompilerFlags.cmake
@@ -3,29 +3,22 @@
 macro(set_darma_compiler_flags vt_target)
 
 set(CMAKE_CXX_EXTENSIONS OFF)
-
-if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
+if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU")
   # 4.9.3 complains about std::min not being constexpr
   if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 5))
     message("${PROJECT_NAME} currently requires g++ 5 or greater.  If you need it to work with 4.9, please complain.")
   endif ()
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6)
-    list(APPEND TARGET_PRIVATE_CXX_FLAGS -Wno-unused-variable)
-  endif()
-elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
+elseif (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
   list(APPEND TARGET_PUBLIC_CXX_FLAGS -ftemplate-depth=900)
   if (APPLE)
     list(APPEND TARGET_PUBLIC_CXX_FLAGS -stdlib=libc++ -DCLI11_EXPERIMENTAL_OPTIONAL=0)
   endif ()
   if (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 7)
     list(APPEND TARGET_PUBLIC_CXX_FLAGS -DCLI11_EXPERIMENTAL_OPTIONAL=0)
   endif()
-  if (CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6)
-    list(APPEND TARGET_PRIVATE_CXX_FLAGS -Wno-missing-braces)
-  endif()
 elseif (CMAKE_CXX_COMPILER_ID STREQUAL IntelLLVM AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL 2021.3.0)
   list(APPEND TARGET_PRIVATE_CXX_FLAGS -fhonor-infinites -fhonor-nans)
-elseif (NOT "${CMAKE_CXX_COMPILER_ID}" MATCHES "Intel")
+elseif (NOT ${CMAKE_CXX_COMPILER_ID} MATCHES "Intel")
   message(FATAL_ERROR "Your C++ compiler may not support C++14.")
 endif ()
 

diff --git a/cmake/turn_on_warnings.cmake b/cmake/turn_on_warnings.cmake
@@ -1,7 +1,7 @@
 include(CheckCXXCompilerFlag)
 
 macro(add_cxx_compiler_flag_if_supported flag)
-  check_cxx_compiler_flag("${flag}" flag_supported)
+  check_cxx_compiler_flag(${flag} flag_supported)
   if(flag_supported)
     list(APPEND VT_WARNING_FLAGS "${flag}")
   endif()
@@ -20,6 +20,16 @@ if(NOT DEFINED VT_WARNING_FLAGS)
   if (vt_werror_enabled)   # Treat warning as errors
   add_cxx_compiler_flag_if_supported("-Werror")
   endif()
+
+  # Silence some spurious warnings on older compilers
+  if (${CMAKE_CXX_COMPILER_ID} MATCHES "GNU" AND
+      CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6)
+    list(APPEND VT_WARNING_FLAGS -Wno-unused-variable)
+  endif()
+  if (${CMAKE_CXX_COMPILER_ID} MATCHES "Clang" AND
+      CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6)
+    list(APPEND VT_WARNING_FLAGS -Wno-missing-braces)
+  endif()
 endif()
 
 set(