diff --git a/CMakeLists.txt b/CMakeLists.txt
index a237b7e2..0945b88b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,6 +44,9 @@ option(OPT_BUILD_FREQUENCY_MANAGER "Build the Frequency Manager module" ON)
 option(OPT_BUILD_RECORDER "Audio and baseband recorder" ON)
 option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with software like gpredict" ON)
 
+# Core of SDR++
+add_subdirectory("core")
+
 # Compiler arguments for each platform
 if (MSVC)
     add_compile_options(/O2 /Ob2 /std:c++17 /EHsc)
@@ -53,10 +56,6 @@ else ()
     add_compile_options(-O3 -std=c++17)
 endif ()
 
-# Core of SDR++
-add_subdirectory("core")
-
-
 # Source modules
 if (OPT_BUILD_AIRSPY_SOURCE)
 add_subdirectory("source_modules/airspy_source")
diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt
index f9657b6d..17f8450d 100644
--- a/core/CMakeLists.txt
+++ b/core/CMakeLists.txt
@@ -18,8 +18,7 @@ add_library(sdrpp_core SHARED ${SRC})
 if (MSVC)
     target_compile_options(sdrpp_core PRIVATE /O2 /Ob2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
-    target_compile_options(sdrpp_core PRIVATE -O3 -Wno-unused-command-line-argument -undefined dynamic_lookup)
-    target_compile_options(sdrpp_core PRIVATE $<$<COMPILE_LANGUAGE:CXX>:-std=c++17>)
+    target_compile_options(sdrpp_core PRIVATE -O3 -std=c++17 -Wno-unused-command-line-argument -undefined dynamic_lookup)
 else ()
     target_compile_options(sdrpp_core PRIVATE -O3 -std=c++17)
 endif ()