mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-25 17:28:50 -05:00
Try Python3_ROOT_DIR
This commit is contained in:
parent
8e81d3825a
commit
7a9b5ee068
4
.github/workflows/mac.yml
vendored
4
.github/workflows/mac.yml
vendored
@ -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=ON -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 -DPython3_ROOT_DIR=`pwd`/.venv
|
||||||
- name: Build SDRangel on Mac
|
- name: Build SDRangel on Mac
|
||||||
run: |
|
run: |
|
||||||
source .venv/bin/activate
|
source .venv/bin/activate
|
||||||
@ -95,7 +95,7 @@ jobs:
|
|||||||
source .venv/bin/activate
|
source .venv/bin/activate
|
||||||
which python3
|
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=ON -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 -DPython3_ROOT_DIR=`pwd`/.venv
|
||||||
- name: Build SDRangel on Mac
|
- name: Build SDRangel on Mac
|
||||||
run: |
|
run: |
|
||||||
source .venv/bin/activate
|
source .venv/bin/activate
|
||||||
|
5
external/CMakeLists.txt
vendored
5
external/CMakeLists.txt
vendored
@ -1560,6 +1560,11 @@ if (WIN32 OR APPLE)
|
|||||||
else ()
|
else ()
|
||||||
set(UHD_PYTHON_ARGS "")
|
set(UHD_PYTHON_ARGS "")
|
||||||
endif ()
|
endif ()
|
||||||
|
if (DEFINED Python3_ROOT_DIR)
|
||||||
|
set(UHD_PYTHON_ARGS "-DPython3_ROOT_DIR=${Python3_ROOT_DIR}")
|
||||||
|
else ()
|
||||||
|
set(UHD_PYTHON_ARGS "")
|
||||||
|
endif ()
|
||||||
ExternalProject_Add(uhd
|
ExternalProject_Add(uhd
|
||||||
GIT_REPOSITORY https://github.com/EttusResearch/uhd.git
|
GIT_REPOSITORY https://github.com/EttusResearch/uhd.git
|
||||||
GIT_TAG ${UHD_TAG}
|
GIT_TAG ${UHD_TAG}
|
||||||
|
Loading…
Reference in New Issue
Block a user