From 4d1759bf9a73463976813f04808ef9999ea0c78c Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 30 Nov 2019 14:23:20 +0100 Subject: [PATCH 1/2] Use python3-mako and python3-six in build-ubuntu job --- .github/workflows/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 33df45f29..41649c9ab 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -8,7 +8,7 @@ jobs: steps: - uses: actions/checkout@v1 - name: install-dependencies - run: sudo apt-get update && sudo apt-get install ninja-build libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpugixml-dev libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev python-mako python-six libmatio-dev googletest protobuf-compiler libprotobuf-dev + run: sudo apt-get update && sudo apt-get install ninja-build libboost-dev libboost-date-time-dev libboost-system-dev libboost-filesystem-dev libboost-thread-dev libboost-chrono-dev libboost-serialization-dev liblog4cpp5-dev gnuradio-dev gr-osmosdr libpugixml-dev libpcap-dev libblas-dev liblapack-dev libarmadillo-dev libgflags-dev libgoogle-glog-dev libgnutls-openssl-dev libmatio-dev googletest protobuf-compiler libprotobuf-dev python3-mako python3-six - name: configure run: cd build && cmake -GNinja .. - name: build From b552616b9970f6fd17f16be2986feedeea6251b3 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 30 Nov 2019 17:42:44 +0100 Subject: [PATCH 2/2] Find Python 3 with CMake < 3.12 --- cmake/Modules/SetupPython.cmake | 3 ++- .../volk_gnsssdr/cmake/Modules/VolkPython.cmake | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/Modules/SetupPython.cmake b/cmake/Modules/SetupPython.cmake index 63fb724e0..c6647a803 100644 --- a/cmake/Modules/SetupPython.cmake +++ b/cmake/Modules/SetupPython.cmake @@ -72,7 +72,8 @@ if(CMAKE_VERSION VERSION_LESS 3.12) gnsssdr_python_check_module("six - python 2 and 3 compatibility library" six "True" SIX_FOUND) else() message(STATUS "PYTHON_EXECUTABLE not set - trying by default python3") - message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python2.7 to build for python 2.7") + message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python to build for python 2.7") + set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7 3.8 3.9) find_package(PythonInterp ${GNSSSDR_PYTHON_MIN3_VERSION}) if(NOT PYTHONINTERP_FOUND) message(STATUS "python3 not found - trying with python2.7") diff --git a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake index 6c9b2667d..e3df8cd8d 100644 --- a/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake +++ b/src/algorithms/libs/volk_gnsssdr_module/volk_gnsssdr/cmake/Modules/VolkPython.cmake @@ -71,6 +71,7 @@ if(CMAKE_VERSION VERSION_LESS 3.12) else() message(STATUS "PYTHON_EXECUTABLE not set - trying by default python3") message(STATUS "Use -DPYTHON_EXECUTABLE=/path/to/python to build for python 2.7") + set(Python_ADDITIONAL_VERSIONS 3.4 3.5 3.6 3.7 3.8 3.9) find_package(PythonInterp ${VOLK_PYTHON_MIN3_VERSION}) if(NOT PYTHONINTERP_FOUND) message(STATUS "python3 not found - trying with python2.7")