Reworked cmake compiler arguments

CMakeLists.txt

@@ -46,11 +46,11 @@ option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with softwa
 
 # Compiler arguments for each platform
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 # Core of SDR++

airspy_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(airspy_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

airspyhf_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(airspyhf_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

audio_sink/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(audio_sink)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

bladerf_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(bladerf_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

core/CMakeLists.txt

@@ -1,19 +1,19 @@
 cmake_minimum_required(VERSION 3.13)
 project(sdrpp_core)
 
+add_subdirectory("libcorrect/")
+
 # Set compiler options
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 add_definitions(-DSDRPP_IS_CORE)
 
-add_subdirectory("libcorrect/")
-
 # Main code
 file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c")
 
@@ -96,6 +96,7 @@ else()
     endif ()
 
     if (${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
+        # TODO: Replace with add_compile_options?
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -static")
         set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++")
     endif ()

demo_module/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(demo)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

discord_integration/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(discord_integration)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup -fPIC")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fPIC")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 add_subdirectory("discord-rpc")

falcon9_decoder/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(falcon9_decoder)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c")

file_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(file_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

frequency_manager/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(frequency_manager)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/" "../radio/src")

hackrf_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(hackrf_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

limesdr_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(limesdr_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

m17_decoder/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(m17_decoder)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c")

meteor_demodulator/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(meteor_demodulator)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c")

network_sink/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(network_sink)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

new_portaudio_sink/CMakeLists.txt

@@ -2,9 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(new_portaudio_sink)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-else()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpermissive")
+    add_compile_options(/O2 /std:c++17 /EHsc)
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
+else ()
+    add_compile_options(-O3 -std=c++17 -fpermissive)
 endif (MSVC)
 
 file(GLOB SRC "src/*.cpp")

plutosdr_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(plutosdr_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

portaudio_sink/CMakeLists.txt

@@ -2,11 +2,14 @@ cmake_minimum_required(VERSION 3.13)
 project(audio_sink)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-else()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -fpermissive")
+    add_compile_options(/O2 /std:c++17 /EHsc)
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
+else ()
+    add_compile_options(-O3 -std=c++17 -fpermissive)
 endif (MSVC)
 
+
 file(GLOB SRC "src/*.cpp")
 
 include_directories("src/")

radio/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(radio)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

recorder/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(recorder)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

rigctl_server/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(rigctl_server)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

rtl_sdr_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(rtl_sdr_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

rtl_tcp_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(rtl_tcp_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

scanner/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(scanner)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

sddc_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(sddc_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/" "src/libsddc/" "src/libsddc/Core/" "src/libsddc/Core/pffft/" "src/libsddc/libsddc/")

sdrplay_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(sdrplay_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

soapy_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(soapy_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB SRC "src/*.cpp")

spyserver_source/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(spyserver_source)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 include_directories("src/")

weather_sat_decoder/CMakeLists.txt

@@ -2,11 +2,11 @@ cmake_minimum_required(VERSION 3.13)
 project(weather_sat_decoder)
 
 if (MSVC)
-    set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
+    add_compile_options(/O2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup")
+    add_compile_options(-O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
+    add_compile_options(-O3 -std=c++17)
 endif ()
 
 file(GLOB_RECURSE SRC "src/*.cpp" "src/*.c")