mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-04-08 11:46:46 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into Geontech-add-acquisition-tracking-monitors

Browse Source
This commit is contained in:
Carles Fernandez 2020-10-21 16:27:30 +02:00
commit 37bc77f6cd
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 2 additions and 2 deletions
cmake/Modules
SetupPython.cmake
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules
VolkPython.cmake

2
cmake/Modules/SetupPython.cmake

@ -49,7 +49,7 @@ endmacro()
# or finds the interpreter via the built-in cmake module.
########################################################################
if(CMAKE_VERSION VERSION_LESS 3.12)
if(CMAKE_VERSION VERSION_LESS 3.12 OR CMAKE_CROSSCOMPILING)
if(PYTHON_EXECUTABLE)
message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
string(FIND "${PYTHON_EXECUTABLE}" "python3" IS_PYTHON3)

2
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake

@ -55,7 +55,7 @@ endmacro()
set(VOLK_PYTHON_MIN_VERSION "2.7")
set(VOLK_PYTHON3_MIN_VERSION "3.4")
if(CMAKE_VERSION VERSION_LESS 3.12)
if(CMAKE_VERSION VERSION_LESS 3.12 OR CMAKE_CROSSCOMPILING)
if(PYTHON_EXECUTABLE)
message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED)