mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-16 13:10:35 +00:00
Code Issues Releases Wiki Activity

Merge branch 'next' of https://github.com/carlesfernandez/gnss-sdr into next

Browse Source
This commit is contained in:
Carles Fernandez 2018-07-24 13:48:54 +02:00
commit fe2f155211
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmake/Modules/SetupPython.cmake
View File

@ -26,9 +26,13 @@ if (PYTHON_EXECUTABLE)
message(STATUS "User set python executable ${PYTHON_EXECUTABLE}") message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
find_package(PythonInterp ${GNSSSDR_PYTHON_MIN_VERSION} REQUIRED) find_package(PythonInterp ${GNSSSDR_PYTHON_MIN_VERSION} REQUIRED)
else (PYTHON_EXECUTABLE) else (PYTHON_EXECUTABLE)
message(STATUS "PYTHON_EXECUTABLE not set - using default python3") message(STATUS "PYTHON_EXECUTABLE not set - using default python2")
message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python2 to build for python2.") find_package(PythonInterp ${GNSSSDR_PYTHON_MIN_VERSION})
find_package(PythonInterp ${GNSSSDR_PYTHON3_MIN_VERSION} REQUIRED) if(NOT PYTHONINTERP_FOUND)
# message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python2 to build for python2.")
message(STATUS "python2 not found - using python3")
find_package(PythonInterp ${GNSSSDR_PYTHON3_MIN_VERSION} REQUIRED)
endif(NOT PYTHONINTERP_FOUND)
endif (PYTHON_EXECUTABLE) endif (PYTHON_EXECUTABLE)
if (${PYTHON_VERSION_MAJOR} VERSION_EQUAL 3) if (${PYTHON_VERSION_MAJOR} VERSION_EQUAL 3)

16
src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake
View File

@ -29,17 +29,17 @@ set(VOLK_PYTHON_MIN_VERSION "2.7")
set(VOLK_PYTHON3_MIN_VERSION "3.4") set(VOLK_PYTHON3_MIN_VERSION "3.4")
if (PYTHON_EXECUTABLE) if (PYTHON_EXECUTABLE)
message(STATUS "User set python executable ${PYTHON_EXECUTABLE}") message(STATUS "User set python executable ${PYTHON_EXECUTABLE}")
find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED)
else (PYTHON_EXECUTABLE)
message(STATUS "PYTHON_EXECUTABLE not set - using default python3")
message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python2 to build for python2.")
find_package(PythonInterp ${VOLK_PYTHON3_MIN_VERSION} REQUIRED) find_package(PythonInterp ${VOLK_PYTHON3_MIN_VERSION} REQUIRED)
else (PYTHON_EXECUTABLE)
message(STATUS "PYTHON_EXECUTABLE not set - using default python2")
message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python3 to build for python3.")
find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION})
if(NOT PYTHONINTERP_FOUND)
message(STATUS "python2 not found - using python3")
find_package(PythonInterp ${VOLK_PYTHON3_MIN_VERSION} REQUIRED)
endif(NOT PYTHONINTERP_FOUND)
endif (PYTHON_EXECUTABLE) endif (PYTHON_EXECUTABLE)
if (${PYTHON_VERSION_MAJOR} VERSION_EQUAL 3)
set(PYTHON3 TRUE)
endif ()
find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} EXACT) find_package(PythonLibs ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} EXACT)
######################################################################## ########################################################################