From b16c1de541b38d8dcd3cfb61e29fcf1b0affcd9d Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Thu, 5 Oct 2023 15:11:21 +0200 Subject: [PATCH] Fix breaking change in CMake 3.27: PythonInterp was removed --- CMakeLists.txt | 2 +- cmake/Modules/SetupPython.cmake | 4 +++- .../volk_gnsssdr/cmake/Modules/VolkPython.cmake | 14 ++++++++++---- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 81f15e3b6..56aeda777 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1116,7 +1116,7 @@ if(NOT VOLKGNSSSDR_FOUND) endif() endif() - if(PYTHONINTERP_FOUND) + if(CMAKE_VERSION VERSION_LESS 3.27 AND PYTHONINTERP_FOUND) set_package_properties(PythonInterp PROPERTIES URL "https://www.python.org/" DESCRIPTION "An interpreted, high-level, general-purpose programming language (found: v${PYTHON_VERSION_STRING})" diff --git a/cmake/Modules/SetupPython.cmake b/cmake/Modules/SetupPython.cmake index 2260357ce..e203e21df 100644 --- a/cmake/Modules/SetupPython.cmake +++ b/cmake/Modules/SetupPython.cmake @@ -97,7 +97,9 @@ else() endif() if(NOT MAKO_FOUND OR NOT SIX_FOUND) unset(PYTHON_EXECUTABLE) - find_package(PythonInterp ${GNSSSDR_PYTHON_MIN_VERSION}) + if(CMAKE_VERSION VERSION_LESS 3.27) + find_package(PythonInterp ${GNSSSDR_PYTHON_MIN_VERSION}) + endif() gnsssdr_python_check_module("python >= ${GNSSSDR_PYTHON_MIN_VERSION}" sys "sys.version.split()[0] >= '${GNSSSDR_PYTHON_MIN_VERSION}'" PYTHON_MIN_VER_FOUND) gnsssdr_python_check_module("mako >= ${GNSSSDR_MAKO_MIN_VERSION}" mako "mako.__version__ >= '${GNSSSDR_MAKO_MIN_VERSION}'" MAKO_FOUND) if(PYTHON_VERSION_STRING VERSION_LESS "3.0") 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 2fc0819b7..8d724a2c0 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,7 +71,9 @@ if(CMAKE_VERSION VERSION_LESS 3.12 OR CMAKE_CROSSCOMPILING) else() if(PYTHON_EXECUTABLE) message(STATUS "User set python executable ${PYTHON_EXECUTABLE}") - find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED) + if(CMAKE_VERSION VERSION_LESS "3.27") + find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION} REQUIRED) + endif() volk_python_check_module("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND) if(PYTHON_VERSION_STRING VERSION_LESS "3.0") volk_python_check_module("six - python 2 and 3 compatibility library" six "True" SIX_FOUND) @@ -102,15 +104,19 @@ else() endif() if(NOT MAKO_FOUND OR NOT SIX_FOUND) unset(PYTHON_EXECUTABLE) - find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION}) + if(CMAKE_VERSION VERSION_LESS "3.27") + find_package(PythonInterp ${VOLK_PYTHON_MIN_VERSION}) + endif() volk_python_check_module("mako >= 0.4.2" mako "mako.__version__ >= '0.4.2'" MAKO_FOUND) endif() endif() endif() endif() -if(${PYTHON_VERSION_MAJOR} VERSION_EQUAL 3) - set(PYTHON3 TRUE) +if(CMAKE_VERSION VERSION_LESS "3.27") + if(${PYTHON_VERSION_MAJOR} VERSION_EQUAL 3) + set(PYTHON3 TRUE) + endif() endif()