Merge pull request #4260 from vicentebolea/install-test-remove-werror

cmake: only remove werror|wall install test

Author: vicentebolea

testing/install/CMakeLists.txt

@@ -84,13 +84,11 @@ set_tests_properties(Install.Setup PROPERTIES
 
 # Remove -Wall -Werror in this scope
 if(CMAKE_C_FLAGS)
-  string(REPLACE "-Wall"    " " CMAKE_C_FLAGS   ${CMAKE_C_FLAGS})
-  string(REPLACE "-Werror"  " " CMAKE_C_FLAGS   ${CMAKE_C_FLAGS})
+  string(REPLACE REGEX "(^| )(-Wall|-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})
+  string(REPLACE REGEX "(^| )(-Wall|-Werror)( |$)" " " CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
 endif()
 
 add_install_cmake_test(C)