Reinstate "e Move some repetitious CMake code to new file WarningsAsE…

…rrors.cmake" having worked out why it initially seemed to break Linux builds, and fixed the error in b4ceef8 This reverts commit 662c549
approvals · Jan 30, 2020 · c07a06a · c07a06a
1 parent e5fc90d
commit c07a06a
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 57 deletions.
diff --git a/CMake/WarningsAsErrors.cmake b/CMake/WarningsAsErrors.cmake
@@ -0,0 +1,19 @@
+if (CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+            /W4
+            /WX
+            )
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+            -Wall
+            -Wextra
+            -Wpedantic
+            -Werror
+            )
+elseif (CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+    string(REGEX REPLACE " /W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
+    target_compile_options(${PROJECT_NAME} PRIVATE
+            /W4
+            /WX
+            )
+endif ()
diff --git a/tests/Catch2_Tests/CMakeLists.txt b/tests/Catch2_Tests/CMakeLists.txt
@@ -45,22 +45,4 @@ if(APPROVAL_TESTS_ENABLE_CODE_COVERAGE)
             DEPENDENCIES ${PROJECT_NAME})
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        /W4
-        /WX
-        )
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        -Wall
-        -Wextra
-        -Wpedantic
-        -Werror
-        )
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    string(REGEX REPLACE " /W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        /W4
-        /WX
-        )
-endif()
+include(WarningsAsErrors)
diff --git a/tests/DocTest_Tests/CMakeLists.txt b/tests/DocTest_Tests/CMakeLists.txt
@@ -20,22 +20,4 @@ if(APPROVAL_TESTS_ENABLE_CODE_COVERAGE)
             DEPENDENCIES ${PROJECT_NAME})
 endif()
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        /W4
-        /WX
-        )
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        -Wall
-        -Wextra
-        -Wpedantic
-        -Werror
-        )
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    string(REGEX REPLACE " /W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        /W4
-        /WX
-        )
-endif()
+include(WarningsAsErrors)
diff --git a/tests/GoogleTest_Tests/CMakeLists.txt b/tests/GoogleTest_Tests/CMakeLists.txt
@@ -10,22 +10,4 @@ target_link_libraries(${PROJECT_NAME} ApprovalTests::ApprovalTests gtest gtest_m
 
 add_test(NAME ${PROJECT_NAME} COMMAND ${PROJECT_NAME})
 
-if(CMAKE_CXX_COMPILER_ID MATCHES "Clang" AND CMAKE_CXX_SIMULATE_ID MATCHES "MSVC")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        /W4
-        /WX
-        )
-elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        -Wall
-        -Wextra
-        -Wpedantic
-        -Werror
-        )
-elseif(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
-    string(REGEX REPLACE " /W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
-    target_compile_options(${PROJECT_NAME} PRIVATE
-        /W4
-        /WX
-        )
-endif()
+include(WarningsAsErrors)