From 6495e5dd0f85fd4622fdb34e311d59d892145492 Mon Sep 17 00:00:00 2001 From: "Tobias Wellnitz, DH1TW" Date: Sat, 27 Sep 2025 23:23:21 +0200 Subject: [PATCH 1/6] bump cmake_minimum_required Version to 3.12 --- core/libcorrect/CMakeLists.txt | 2 +- misc_modules/discord_integration/discord-rpc/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt index 7fce281dc..ad72aeb9e 100644 --- a/core/libcorrect/CMakeLists.txt +++ b/core/libcorrect/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8) +cmake_minimum_required(VERSION 3.12) project(Correct C) include(CheckLibraryExists) include(CheckIncludeFiles) diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt index 1dc1c9139..dad5575e5 100644 --- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.2.0) +cmake_minimum_required (VERSION 3.12.0) project (DiscordRPC) include(GNUInstallDirs) From c55eb63c7bf4c7edba62662bfb88d7a807e91224 Mon Sep 17 00:00:00 2001 From: "Tobias Wellnitz, DH1TW" Date: Sat, 27 Sep 2025 23:27:18 +0200 Subject: [PATCH 2/6] macos: volk is now available via homebrew --- readme.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/readme.md b/readme.md index 7e1dd3ca5..1b39ca1f7 100644 --- a/readme.md +++ b/readme.md @@ -279,14 +279,10 @@ Make sure to install portaudio as it'll be needed later. An example install command would be: ```sh -brew install libusb fftw glfw airspy airspyhf portaudio hackrf rtl-sdr libbladerf codec2 zstd +brew install libusb fftw glfw airspy airspyhf portaudio hackrf rtl-sdr libbladerf codec2 zstd volk pip3 install mako ``` -### Install volk - -You will need to install volk from source. Follow the instructions on their repository. On M1 there are a few more manipulations needed. - ## Build You will need a few special cmake argument on top of the linux ones. You will need to enable the portaudio sink modules `-DOPT_BUILD_PORTAUDIO_SINK=ON -DOPT_BUILD_NEW_PORTAUDIO_SINK=ON` and disable the usual rtaudio sink `-DOPT_BUILD_AUDIO_SINK=OFF` as well as the option to tell SDR++ that it will run as a MacOS bundle `-DUSE_BUNDLE_DEFAULTS=ON`. On MacOS versions older than Catalina (10.15), you will also need to use the internal std::filesystem as the OS can't provide it `-DOPT_OVERRIDE_STD_FILESYSTEM=ON`. From bb5b84a2db06fa1fb4e49dcbcda3d8f2a7a7918a Mon Sep 17 00:00:00 2001 From: Tobias Wellnitz Date: Sun, 28 Sep 2025 00:08:48 +0200 Subject: [PATCH 3/6] Revert cmake_minimum_required to Version 2.8 --- core/libcorrect/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/libcorrect/CMakeLists.txt b/core/libcorrect/CMakeLists.txt index ad72aeb9e..7fce281dc 100644 --- a/core/libcorrect/CMakeLists.txt +++ b/core/libcorrect/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.12) +cmake_minimum_required(VERSION 2.8) project(Correct C) include(CheckLibraryExists) include(CheckIncludeFiles) From fc5b96f58233092d799083a0eabc63abb9317d9f Mon Sep 17 00:00:00 2001 From: Tobias Wellnitz Date: Sun, 28 Sep 2025 00:09:14 +0200 Subject: [PATCH 4/6] Revert cmake_minimum_required to Version 3.2.0 --- misc_modules/discord_integration/discord-rpc/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt index dad5575e5..eae0ce06a 100644 --- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required (VERSION 3.12.0) +cmake_minimum_required (VERSION 3.2.0) project (DiscordRPC) include(GNUInstallDirs) @@ -11,4 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES # add subdirs -add_subdirectory(src) \ No newline at end of file +add_subdirectory(src) From c9cafcfc525675bd709d8095f1c0b139548c4220 Mon Sep 17 00:00:00 2001 From: Tobias Wellnitz Date: Sun, 28 Sep 2025 00:10:36 +0200 Subject: [PATCH 5/6] reverse undesired change --- misc_modules/discord_integration/discord-rpc/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt index eae0ce06a..9b18ec059 100644 --- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt @@ -11,4 +11,3 @@ file(GLOB_RECURSE ALL_SOURCE_FILES # add subdirs -add_subdirectory(src) From dd5ba43b156f01264d13f3678866057cddce1d24 Mon Sep 17 00:00:00 2001 From: Tobias Wellnitz Date: Sun, 28 Sep 2025 00:12:14 +0200 Subject: [PATCH 6/6] undo changes (argh) --- misc_modules/discord_integration/discord-rpc/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt index 9b18ec059..1dc1c9139 100644 --- a/misc_modules/discord_integration/discord-rpc/CMakeLists.txt +++ b/misc_modules/discord_integration/discord-rpc/CMakeLists.txt @@ -11,3 +11,4 @@ file(GLOB_RECURSE ALL_SOURCE_FILES # add subdirs +add_subdirectory(src) \ No newline at end of file