From 6d1d560f8dac701de94875684f0f3eea27c456b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Mon, 18 Jan 2021 16:55:20 +0100 Subject: [PATCH 1/2] #1222: ci: do not warn about unused variables in gcc-5 build --- cmake-modules/SetCXXCompilerFlags.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cmake-modules/SetCXXCompilerFlags.cmake b/cmake-modules/SetCXXCompilerFlags.cmake index a74575745e..90299a116c 100644 --- 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) From c6f0f068bad89ac81c54694518025b2884b263af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cezary=20Skrzy=C5=84ski?= Date: Mon, 18 Jan 2021 20:17:05 +0100 Subject: [PATCH 2/2] #1222: ci: enable -Werror for gcc-5 build --- ci/azure/azure-gcc-5-ubuntu-mpich.yml | 2 +- scripts/workflows-azure.ini | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/ci/azure/azure-gcc-5-ubuntu-mpich.yml b/ci/azure/azure-gcc-5-ubuntu-mpich.yml index c4d2640d92..d12518c6f2 100644 --- 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/scripts/workflows-azure.ini b/scripts/workflows-azure.ini index 8a6eb59069..7411ee9d6b 100644 --- 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"