VE7UWU/sdrangel
1
0
Fork 0
mirror of https://github.com/f4exb/sdrangel.git synced 2024-11-22 08:04:49 -05:00
Code Issues Projects Releases Wiki Activity

Update boost to latest release. 1.78 fails to build using c++17

Browse Source 
Update UHD to 4.7 and set -DENABLE_PYTHON_API=OFF to try to remove runtime python requirement.
This commit is contained in:
Jon Beniston 2024-11-01 10:10:31 +00:00
parent 03f4dfe2e1
commit 8e81d3825a
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/mac.yml vendored
View File

@ -39,7 +39,7 @@ jobs:
run: | run: |
source .venv/bin/activate source .venv/bin/activate
mkdir build && cd build 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 - name: Build SDRangel on Mac
run: | run: |
source .venv/bin/activate source .venv/bin/activate
@ -81,6 +81,7 @@ jobs:
run: | run: |
python3 -m venv .venv python3 -m venv .venv
source .venv/bin/activate source .venv/bin/activate
which python3
python3 -m pip install numpy mako requests Cheetah3 setuptools python3 -m pip install numpy mako requests Cheetah3 setuptools
- name: Install Qt - name: Install Qt
uses: jurplel/install-qt-action@v4 uses: jurplel/install-qt-action@v4
@ -92,8 +93,9 @@ jobs:
- name: Configure SDRangel - name: Configure SDRangel
run: | run: |
source .venv/bin/activate source .venv/bin/activate
which python3
mkdir build && cd build 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 - name: Build SDRangel on Mac
run: | run: |
source .venv/bin/activate source .venv/bin/activate

13
external/CMakeLists.txt vendored
View File

@ -31,15 +31,9 @@ set(SOAPYSDR_REMOTE_TAG "soapy-remote-0.5.1")
set(AIRSPY_TAG "37c768ce9997b32e7328eb48972a7fda0a1f8554") set(AIRSPY_TAG "37c768ce9997b32e7328eb48972a7fda0a1f8554")
set(HACKRF_TAG "v2022.09.1") set(HACKRF_TAG "v2022.09.1")
set(LIBXML2_TAG "v2.10.4") set(LIBXML2_TAG "v2.10.4")
set(UHD_TAG "v4.6.0.0") set(UHD_TAG "v4.7.0.0")
if (APPLE AND (CMAKE_HOST_SYSTEM_PROCESSOR STREQUAL x86_64)) set(BOOST_TAG "1.86.0")
# UHD fails to load with 1.80+ set(BOOST_TAG2 "1_86_0")
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()
# For some external project macros # For some external project macros
include(ExternalProject) include(ExternalProject)
@ -1578,6 +1572,7 @@ if (WIN32 OR APPLE)
-DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES} -DLIBUSB_LIBRARIES=${LIBUSB_LIBRARIES}
-DLIBUSB_INCLUDE_DIR=${LIBUSB_INCLUDE_DIR} -DLIBUSB_INCLUDE_DIR=${LIBUSB_INCLUDE_DIR}
${UHD_PYTHON_ARGS} ${UHD_PYTHON_ARGS}
-DENABLE_PYTHON_API=OFF
-DCMAKE_INSTALL_NAME_DIR=<INSTALL_DIR>/lib -DCMAKE_INSTALL_NAME_DIR=<INSTALL_DIR>/lib
TEST_COMMAND "" TEST_COMMAND ""
) )