From 8e81d3825a57ce5dcda56267740578cb3547d772 Mon Sep 17 00:00:00 2001 From: Jon Beniston Date: Fri, 1 Nov 2024 10:10:31 +0000 Subject: [PATCH] Update boost to latest release. 1.78 fails to build using c++17 Update UHD to 4.7 and set -DENABLE_PYTHON_API=OFF to try to remove runtime python requirement. --- .github/workflows/mac.yml | 6 ++++-- external/CMakeLists.txt | 13 ++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/.github/workflows/mac.yml b/.github/workflows/mac.yml index 805ab64e5..e169d439d 100644 --- a/.github/workflows/mac.yml +++ b/.github/workflows/mac.yml @@ -39,7 +39,7 @@ jobs: run: | source .venv/bin/activate mkdir build && cd build - cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_USRP=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE + cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DARCH_OPT=nehalem -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE - name: Build SDRangel on Mac run: | source .venv/bin/activate @@ -81,6 +81,7 @@ jobs: run: | python3 -m venv .venv source .venv/bin/activate + which python3 python3 -m pip install numpy mako requests Cheetah3 setuptools - name: Install Qt uses: jurplel/install-qt-action@v4 @@ -92,8 +93,9 @@ jobs: - name: Configure SDRangel run: | source .venv/bin/activate + which python3 mkdir build && cd build - cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=ON -DENABLE_USRP=OFF -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE + cmake .. -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_QT6=ON -DCMAKE_BUILD_TYPE=Release -DDEBUG_OUTPUT=ON -DENABLE_USRP=ON -DENABLE_MIRISDR=OFF -DBUILD_SERVER=OFF -DENABLE_EXTERNAL_LIBRARIES=ON -DBUNDLE=ON -DPKG_CONFIG_USE_CMAKE_PREFIX_PATH=TRUE - name: Build SDRangel on Mac run: | source .venv/bin/activate diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index 00f815005..7dade82a9 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -31,15 +31,9 @@ set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1") set(AIRSPY_TAG "37c768ce9997b32e7328eb48972a7fda0a1f8554") set(HACKRF_TAG "v2022.09.1") set(LIBXML2_TAG "v2.10.4") -set(UHD_TAG "v4.6.0.0") -if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64)) - # UHD fails to load with 1.80+ - set(BOOST_TAG "1.78.0") - set(BOOST_TAG2 "1_78_0") -else() - set(BOOST_TAG "1.83.0") - set(BOOST_TAG2 "1_83_0") -endif() +set(UHD_TAG "v4.7.0.0") +set(BOOST_TAG "1.86.0") +set(BOOST_TAG2 "1_86_0") # For some external project macros include(ExternalProject) @@ -1578,6 +1572,7 @@ if (WIN32 OR APPLE) -DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES} -DLIBUSB_INCLUDE_DIR=${LIBUSB_INCLUDE_DIR} ${UHD_PYTHON_ARGS} + -DENABLE_PYTHON_API=OFF -DCMAKE_INSTALL_NAME_DIR=/lib TEST_COMMAND "" )