diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8f9a4f..b207bb3 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -84,8 +84,8 @@ endif (OPT_BUILD_WEATHER_SAT_DECODER)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/airspy_source/CMakeLists.txt b/airspy_source/CMakeLists.txt
index cea6586..86075a6 100644
--- a/airspy_source/CMakeLists.txt
+++ b/airspy_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(airspy_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/airspyhf_source/CMakeLists.txt b/airspyhf_source/CMakeLists.txt
index 6d7f37a..2d780a0 100644
--- a/airspyhf_source/CMakeLists.txt
+++ b/airspyhf_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(airspyhf_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/audio_sink/CMakeLists.txt b/audio_sink/CMakeLists.txt
index d877e89..d9a4a41 100644
--- a/audio_sink/CMakeLists.txt
+++ b/audio_sink/CMakeLists.txt
@@ -3,8 +3,8 @@ project(audio_sink)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/bladerf_source/CMakeLists.txt b/bladerf_source/CMakeLists.txt
index d6ecfd4..ebed017 100644
--- a/bladerf_source/CMakeLists.txt
+++ b/bladerf_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(bladerf_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index c7d39ab..05fc3e7 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -5,8 +5,8 @@ project(sdrpp_core)
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
     set(CMAKE_WINDOWS_EXPORT_ALL_SYMBOLS ON)
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/falcon9_decoder/CMakeLists.txt b/falcon9_decoder/CMakeLists.txt
index e283d9f..f97c61e 100644
--- a/falcon9_decoder/CMakeLists.txt
+++ b/falcon9_decoder/CMakeLists.txt
@@ -3,8 +3,8 @@ project(falcon9_decoder)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/file_source/CMakeLists.txt b/file_source/CMakeLists.txt
index 1a05ebe..896deef 100644
--- a/file_source/CMakeLists.txt
+++ b/file_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(file_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/hackrf_source/CMakeLists.txt b/hackrf_source/CMakeLists.txt
index 8ef65a2..cc20c0b 100644
--- a/hackrf_source/CMakeLists.txt
+++ b/hackrf_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(hackrf_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/meteor_demodulator/CMakeLists.txt b/meteor_demodulator/CMakeLists.txt
index 71007a6..052adfb 100644
--- a/meteor_demodulator/CMakeLists.txt
+++ b/meteor_demodulator/CMakeLists.txt
@@ -3,8 +3,8 @@ project(meteor_demodulator)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/plutosdr_source/CMakeLists.txt b/plutosdr_source/CMakeLists.txt
index adc5ac8..07a882f 100644
--- a/plutosdr_source/CMakeLists.txt
+++ b/plutosdr_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(plutosdr_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/radio/CMakeLists.txt b/radio/CMakeLists.txt
index b05240c..7a7fd55 100644
--- a/radio/CMakeLists.txt
+++ b/radio/CMakeLists.txt
@@ -3,8 +3,8 @@ project(radio)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/recorder/CMakeLists.txt b/recorder/CMakeLists.txt
index e3a32a4..345237a 100644
--- a/recorder/CMakeLists.txt
+++ b/recorder/CMakeLists.txt
@@ -3,8 +3,8 @@ project(recorder)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/rtl_sdr_source/CMakeLists.txt b/rtl_sdr_source/CMakeLists.txt
index b763b88..e54c54a 100644
--- a/rtl_sdr_source/CMakeLists.txt
+++ b/rtl_sdr_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(rtl_sdr_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/rtl_tcp_source/CMakeLists.txt b/rtl_tcp_source/CMakeLists.txt
index bc23117..ab5630c 100644
--- a/rtl_tcp_source/CMakeLists.txt
+++ b/rtl_tcp_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(rtl_tcp_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/rx888_source/CMakeLists.txt b/rx888_source/CMakeLists.txt
index 9cbc55c..d5a9055 100644
--- a/rx888_source/CMakeLists.txt
+++ b/rx888_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(rx888_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/sdrplay_source/CMakeLists.txt b/sdrplay_source/CMakeLists.txt
index 5d7e74b..e8b82fc 100644
--- a/sdrplay_source/CMakeLists.txt
+++ b/sdrplay_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(sdrplay_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/soapy_source/CMakeLists.txt b/soapy_source/CMakeLists.txt
index 2e3a051..20cb5ba 100644
--- a/soapy_source/CMakeLists.txt
+++ b/soapy_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(soapy_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/spyserver_source/CMakeLists.txt b/spyserver_source/CMakeLists.txt
index b1184df..c30ec54 100644
--- a/spyserver_source/CMakeLists.txt
+++ b/spyserver_source/CMakeLists.txt
@@ -3,8 +3,8 @@ project(spyserver_source)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()
diff --git a/weather_sat_decoder/CMakeLists.txt b/weather_sat_decoder/CMakeLists.txt
index 8e0a6c3..c557650 100644
--- a/weather_sat_decoder/CMakeLists.txt
+++ b/weather_sat_decoder/CMakeLists.txt
@@ -3,8 +3,8 @@ project(weather_sat_decoder)
 
 if (MSVC)
     set(CMAKE_CXX_FLAGS "-O2 /std:c++17 /EHsc")
-elseif (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
-    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -undefined dynamic_lookup")
+elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    set(CMAKE_CXX_FLAGS "-O3 -std=c++17 -Wnounused-command-line-argument -undefined dynamic_lookup")
 else ()
     set(CMAKE_CXX_FLAGS "-O3 -std=c++17")
 endif ()