mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2024-12-15 12:40:35 +00:00
Merge branch 'next' of https://github.com/gnss-sdr/gnss-sdr into next
This commit is contained in:
commit
cc6c6ab828
@ -84,7 +84,7 @@ if(CMAKE_VERSION VERSION_LESS 3.12)
|
|||||||
endif(PYTHON_EXECUTABLE)
|
endif(PYTHON_EXECUTABLE)
|
||||||
find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} EXACT)
|
find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} EXACT)
|
||||||
else(CMAKE_VERSION VERSION_LESS 3.12)
|
else(CMAKE_VERSION VERSION_LESS 3.12)
|
||||||
find_package (Python3 COMPONENTS Interpreter Development)
|
find_package (Python3 COMPONENTS Interpreter)
|
||||||
if(Python3_FOUND)
|
if(Python3_FOUND)
|
||||||
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
|
set(PYTHON_EXECUTABLE ${Python3_EXECUTABLE})
|
||||||
set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR})
|
set(PYTHON_VERSION_MAJOR ${Python3_VERSION_MAJOR})
|
||||||
@ -93,7 +93,7 @@ else(CMAKE_VERSION VERSION_LESS 3.12)
|
|||||||
GNSSSDR_PYTHON_CHECK_MODULE("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
|
GNSSSDR_PYTHON_CHECK_MODULE("six - python 2 and 3 compatibility library" six "True" SIX_FOUND)
|
||||||
endif(Python3_FOUND)
|
endif(Python3_FOUND)
|
||||||
if(NOT Python3_FOUND OR NOT MAKO_FOUND OR NOT SIX_FOUND)
|
if(NOT Python3_FOUND OR NOT MAKO_FOUND OR NOT SIX_FOUND)
|
||||||
find_package(Python2 COMPONENTS Interpreter Development)
|
find_package(Python2 COMPONENTS Interpreter)
|
||||||
if(Python2_FOUND)
|
if(Python2_FOUND)
|
||||||
set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
|
set(PYTHON_EXECUTABLE ${Python2_EXECUTABLE})
|
||||||
set(PYTHON_VERSION_MAJOR ${Python2_VERSION_MAJOR})
|
set(PYTHON_VERSION_MAJOR ${Python2_VERSION_MAJOR})
|
||||||
|
@ -47,7 +47,7 @@ else(CMAKE_VERSION VERSION_LESS 3.12)
|
|||||||
message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
|
message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
|
||||||
find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED)
|
find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED)
|
||||||
else(PYTHON_EXECUTABLE)
|
else(PYTHON_EXECUTABLE)
|
||||||
find_package (Python COMPONENTS Interpreter Development)
|
find_package (Python COMPONENTS Interpreter)
|
||||||
set(PYTHON_VERSION_MAJOR ${Python_VERSION_MAJOR})
|
set(PYTHON_VERSION_MAJOR ${Python_VERSION_MAJOR})
|
||||||
set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
|
set(PYTHON_EXECUTABLE ${Python_EXECUTABLE})
|
||||||
endif(PYTHON_EXECUTABLE)
|
endif(PYTHON_EXECUTABLE)
|
||||||
|
Loading…
Reference in New Issue
Block a user