fixup! fixup! CI: Enforce -Wall and -Werror

Signed-off-by: Vicente Adolfo Bolea Sanchez <vicente.bolea@kitware.com>
ornladios · Jun 21, 2021 · 2b4e650 · 2b4e650
1 parent 72bb293
commit 2b4e650
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadSzComplex.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadSzComplex.cpp
@@ -179,7 +179,7 @@ void Writer(const Dims &shape, const Dims &start, const Dims &count,
     bpDComplexes.AddOperation(compressor, {{"accuracy", accuracy}});
     io.DefineAttribute<int>("AttInt", 110);
     adios2::Engine writerEngine = io.Open(fileName, adios2::Mode::Write);
-    for (int i = 0; i < steps; ++i)
+    for (int i = 0; i < static_cast<int>(steps); ++i)
     {
         writerEngine.BeginStep();
         GenData(myChars, i, start, count, shape);

diff --git a/testing/adios2/engine/bp/operations/TestBPWriteReadZfpComplex.cpp b/testing/adios2/engine/bp/operations/TestBPWriteReadZfpComplex.cpp
@@ -179,7 +179,7 @@ void Writer(const Dims &shape, const Dims &start, const Dims &count,
     bpDComplexes.AddOperation(zfpOp, {{"accuracy", accuracy}});
     io.DefineAttribute<int>("AttInt", 110);
     adios2::Engine writerEngine = io.Open(fileName, adios2::Mode::Write);
-    for (int i = 0; i < steps; ++i)
+    for (int i = 0; i < static_cast<int>(steps); ++i)
     {
         writerEngine.BeginStep();
         GenData(myChars, i, start, count, shape);

diff --git a/testing/install/CMakeLists.txt b/testing/install/CMakeLists.txt
@@ -83,10 +83,15 @@ set_tests_properties(Install.Setup PROPERTIES
   )
 
 # Remove -Wall -Werror in this scope
-string(REPLACE "-Wall"    "" CMAKE_C_FLAGS   ${CMAKE_C_FLAGS})
-string(REPLACE "-Wall"    "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
-string(REPLACE "-Werror"  "" CMAKE_C_FLAGS   ${CMAKE_C_FLAGS})
-string(REPLACE "-Werror"  "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+if(CMAKE_C_FLAGS)
+  string(REPLACE "-Wall"    " " CMAKE_C_FLAGS   ${CMAKE_C_FLAGS})
+  string(REPLACE "-Werror"  " " CMAKE_C_FLAGS   ${CMAKE_C_FLAGS})
+endif()
+
+if(CMAKE_CXX_FLAGS)
+  string(REPLACE "-Wall"    " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+  string(REPLACE "-Werror"  " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+endif()
 
 add_install_cmake_test(C)
 add_install_cmake_test(CXX11)