From ea0d90517718e27bb1cda067d53a7715faff8be2 Mon Sep 17 00:00:00 2001
From: AlexandreRouma <alexandre.rouma@gmail.com>
Date: Mon, 4 Oct 2021 00:58:16 +0200
Subject: [PATCH] MacOS fix final????

---
 CMakeLists.txt                                  | 17 ++++++++---------
 misc_modules/discord_integration/CMakeLists.txt |  4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ffaa013..d479acf5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,15 +47,6 @@ option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with softwa
 # Core of SDR++
 add_subdirectory("core")
 
-# Compiler arguments for each platform
-if (MSVC)
-    add_compile_options(/O2 /Ob2 /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)
-endif ()
-
 # Source modules
 if (OPT_BUILD_AIRSPY_SOURCE)
 add_subdirectory("source_modules/airspy_source")
@@ -167,6 +158,14 @@ if (OPT_BUILD_RIGCTL_SERVER)
 add_subdirectory("misc_modules/rigctl_server")
 endif (OPT_BUILD_RIGCTL_SERVER)
 
+# Compiler arguments for each platform
+if (MSVC)
+    add_compile_options(/O2 /Ob2 /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)
+endif ()
 
 add_executable(sdrpp "src/main.cpp" "win32/resources.rc")
 target_link_libraries(sdrpp PRIVATE sdrpp_core)
diff --git a/misc_modules/discord_integration/CMakeLists.txt b/misc_modules/discord_integration/CMakeLists.txt
index c3571e20..c15a9634 100644
--- a/misc_modules/discord_integration/CMakeLists.txt
+++ b/misc_modules/discord_integration/CMakeLists.txt
@@ -1,6 +1,8 @@
 cmake_minimum_required(VERSION 3.13)
 project(discord_integration)
 
+add_subdirectory("discord-rpc")
+
 if (MSVC)
     add_compile_options(/O2 /Ob2 /std:c++17 /EHsc)
 elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@@ -9,8 +11,6 @@ else ()
     add_compile_options(-O3 -std=c++17 -fPIC)
 endif ()
 
-add_subdirectory("discord-rpc")
-
 file(GLOB SRC "src/*.cpp")
 include_directories("src/" "discord-rpc/include" "../../decoder_modules/radio/src/")