Merge branch 'nextRelease'

FrankReiser · Oct 11, 2023 · 3c28fc0 · 3c28fc0
2 parents 66679b9 + 412654a
commit 3c28fc0
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 1 deletion.
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -48,7 +48,7 @@ set_target_properties( ${PROJECT_NAME}
         DEBUG_POSTFIX "_d"
 )
 
-target_compile_options(${PROJECT_NAME} PRIVATE
+target_compile_options( ${PROJECT_NAME} PRIVATE
         $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
         $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
 )

diff --git a/sundry/CMakeLists.txt b/sundry/CMakeLists.txt
@@ -2,4 +2,8 @@ add_executable( chirpExp "" )
 target_sources( chirpExp PRIVATE chirpExp.cpp )
 target_include_directories( chirpExp PUBLIC ../src )
 target_link_libraries( chirpExp ReiserRT_ChirpingPhasor )
+target_compile_options( chirpExp PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
+)
 
diff --git a/testUtilities/CMakeLists.txt b/testUtilities/CMakeLists.txt
@@ -1,3 +1,8 @@
 add_library( TestUtilities STATIC "" )
 target_sources( TestUtilities PRIVATE MiscTestUtilities.cpp CommandLineParser.cpp )
+target_compile_options( TestUtilities PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
+)
+
 
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
@@ -2,12 +2,20 @@ add_executable( chirpPurityTest "" )
 target_sources( chirpPurityTest PRIVATE chirpPurityTest.cpp)
 target_include_directories( chirpPurityTest PUBLIC ../src ../testUtilities )
 target_link_libraries( chirpPurityTest ReiserRT_ChirpingPhasor TestUtilities )
+target_compile_options( chirpPurityTest PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
+)
 add_test( NAME runChirpPurityTest COMMAND $<TARGET_FILE:chirpPurityTest> )
 
 add_executable( detailedChirpTest "" )
 target_sources( detailedChirpTest PRIVATE detailedChirpTest.cpp )
 target_include_directories( detailedChirpTest PUBLIC ../src ../testUtilities )
 target_link_libraries( detailedChirpTest ReiserRT_ChirpingPhasor TestUtilities )
+target_compile_options( detailedChirpTest PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
+)
 add_test( NAME runDetailedChirpTest1 COMMAND $<TARGET_FILE:detailedChirpTest> )
 add_test( NAME runDetailedChirpTest2 COMMAND $<TARGET_FILE:detailedChirpTest> --omegaZero=0.5 )
 add_test( NAME runDetailedChirpTest3 COMMAND $<TARGET_FILE:detailedChirpTest> --phi=0.5 )
@@ -20,4 +28,8 @@ add_executable( modifyAccelTest "" )
 target_sources( modifyAccelTest PRIVATE modifyAccelTest.cpp)
 target_include_directories( modifyAccelTest PUBLIC ../src ../testUtilities )
 target_link_libraries( modifyAccelTest ReiserRT_ChirpingPhasor TestUtilities )
+target_compile_options( modifyAccelTest PRIVATE
+        $<$<CXX_COMPILER_ID:MSVC>:/W4 /WX>
+        $<$<NOT:$<CXX_COMPILER_ID:MSVC>>:-Wall -Wextra -Wpedantic -Werror>
+)
 add_test( NAME runModifyAccelTest COMMAND $<TARGET_FILE:modifyAccelTest> )