mirror/SDRPlusPlus
0
0
Fork 0
mirror of https://github.com/AlexandreRouma/SDRPlusPlus.git synced 2025-02-04 13:54:43 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

MacOS fix final????

Browse Source
This commit is contained in:
AlexandreRouma 2021-10-04 00:58:16 +02:00
parent 1be3092c7d
commit ea0d905177
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
CMakeLists.txt
View File

@ -47,15 +47,6 @@ option(OPT_BUILD_RIGCTL_SERVER "Rigctl backend for controlling SDR++ with softwa
# Core of SDR++ # Core of SDR++
add_subdirectory("core") 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 # Source modules
if (OPT_BUILD_AIRSPY_SOURCE) if (OPT_BUILD_AIRSPY_SOURCE)
add_subdirectory("source_modules/airspy_source") add_subdirectory("source_modules/airspy_source")
@ -167,6 +158,14 @@ if (OPT_BUILD_RIGCTL_SERVER)
add_subdirectory("misc_modules/rigctl_server") add_subdirectory("misc_modules/rigctl_server")
endif (OPT_BUILD_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") add_executable(sdrpp "src/main.cpp" "win32/resources.rc")
target_link_libraries(sdrpp PRIVATE sdrpp_core) target_link_libraries(sdrpp PRIVATE sdrpp_core)

4
misc_modules/discord_integration/CMakeLists.txt
View File

@ -1,6 +1,8 @@
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(discord_integration) project(discord_integration)
add_subdirectory("discord-rpc")
if (MSVC) if (MSVC)
add_compile_options(/O2 /Ob2 /std:c++17 /EHsc) add_compile_options(/O2 /Ob2 /std:c++17 /EHsc)
elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
@ -9,8 +11,6 @@ else ()
add_compile_options(-O3 -std=c++17 -fPIC) add_compile_options(-O3 -std=c++17 -fPIC)
endif () endif ()
add_subdirectory("discord-rpc")
file(GLOB SRC "src/*.cpp") file(GLOB SRC "src/*.cpp")
include_directories("src/" "discord-rpc/include" "../../decoder_modules/radio/src/") include_directories("src/" "discord-rpc/include" "../../decoder_modules/radio/src/")