Merge pull request #1223 from DARMA-tasking/1222-gcc-5-spurious-warnings

1222: ci: do not warn about unused variables in gcc-5 build
DARMA-tasking · Jan 18, 2021 · a8d31d2 · a8d31d2
2 parents 14ecb0e + c6f0f06
commit a8d31d2
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/ci/azure/azure-gcc-5-ubuntu-mpich.yml b/ci/azure/azure-gcc-5-ubuntu-mpich.yml
@@ -35,7 +35,7 @@ variables:
   VT_MIMALLOC: 0
   VT_DOCS: 0
   VT_ASAN: 0
-  VT_WERROR: 0
+  VT_WERROR: 1
   VT_POOL: 1
   VT_EXTENDED_TESTS: 1
   VT_UNITY_BUILD: 1

diff --git a/cmake-modules/SetCXXCompilerFlags.cmake b/cmake-modules/SetCXXCompilerFlags.cmake
@@ -9,6 +9,9 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "GNU")
   if (NOT (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 5 OR CMAKE_CXX_COMPILER_VERSION VERSION_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 CXX_STANDARD_FLAGS -Wno-unused-variable)
+  endif()
 elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
   set(CXX_STANDARD_FLAGS -ftemplate-depth=900)
   if (APPLE)

diff --git a/scripts/workflows-azure.ini b/scripts/workflows-azure.ini
@@ -127,7 +127,6 @@ compiler_type = gnu
 compiler = gcc-5
 output_name = ci/azure/azure-gcc-5-ubuntu-mpich.yml
 cache_name = "[% linux %]-[% compiler %]-cache"
-vt_werror = 0
 
 [PR-tests-gcc-6]
 test_configuration = "gcc-6, ubuntu, mpich"