echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FindPython: Fix version range tests

Browse Source 
Tests must be successful when multiple versions are installed.
This commit is contained in:
Marc Chevrier 2020-11-11 16:16:49 +01:00
parent b1208722c5
commit a00603af0b
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
Tests/FindPython/VersionRange/CMakeLists.txt
View File

@ -16,40 +16,49 @@ else()
set (OUT_VERSION_RANGE 3.0...<${${Python}_VERSION})
endif()
function (FIND_PYTHON EXPECTED_VERSION)
unset (_${Python}_EXECUTABLE CACHE)
unset (_${Python}_LIBRARY_RELEASE CACHE)
unset (_${Python}_INCLUDE_DIR CACHE)
unset (${Python}_FOUND)
function (FIND_PYTHON EXPECTED_VERSION RANGE)
macro (FIND_PYTHON_PACKAGE)
unset (_${Python}_EXECUTABLE CACHE)
unset (_${Python}_LIBRARY_RELEASE CACHE)
unset (_${Python}_INCLUDE_DIR CACHE)
unset (${Python}_FOUND)
find_package (${ARGN})
find_package (${Python} ${ARGV})
endmacro()
find_python_package(${RANGE} ${ARGN})
if (EXPECTED_VERSION STREQUAL "NONE")
while (${Python}_FOUND AND ${Python}_VERSION VERSION_GREATER ${Python_REQUESTED_VERSION})
# Possible if multiple versions are installed
# Try with a different range
find_python_package(${Python_REQUESTED_VERSION}.0...<${${Python}_VERSION} ${ARGN})
endwhile()
if (${Python}_FOUND)
message (SEND_ERROR "Unexpectedly found version: ${${Python}_VERSION} for ${ARGN}")
message (SEND_ERROR "Unexpectedly found version: ${${Python}_VERSION} for '${Python} ${Python_REQUESTED_VERSION}.0...<${${Python}_VERSION} ${ARGN}'")
endif()
return()
endif()
if (NOT ${Python}_FOUND)
message (SEND_ERROR "Not found: ${ARGN}")
message (SEND_ERROR "Not found: ${Python} ${RANGE} ${ARGN}")
elseif (NOT ${Python}_VERSION VERSION_EQUAL EXPECTED_VERSION)
message (SEND_ERROR "Wrong version: ${${Python}_VERSION} for ${ARGN}")
message (SEND_ERROR "Wrong version: ${${Python}_VERSION} for '${Python} ${RANGE} ${ARGN}'")
endif()
endfunction()
find_python (${${Python}_VERSION} ${Python} ${IN_VERSION_RANGE} COMPONENTS Interpreter)
find_python (${${Python}_VERSION} ${IN_VERSION_RANGE} COMPONENTS Interpreter)
if (${Python}_FIND_IMPLEMENTATIONS STREQUAL "IronPython")
find_python (${${Python}_VERSION} ${Python} ${IN_VERSION_RANGE} COMPONENTS Compiler)
find_python (${${Python}_VERSION} ${IN_VERSION_RANGE} COMPONENTS Compiler)
else()
find_python (${${Python}_VERSION} ${Python} ${IN_VERSION_RANGE} COMPONENTS Development)
find_python (${${Python}_VERSION} ${IN_VERSION_RANGE} COMPONENTS Development)
endif()
find_python ("NONE" ${Python} ${OUT_VERSION_RANGE} COMPONENTS Interpreter)
find_python ("NONE" ${OUT_VERSION_RANGE} COMPONENTS Interpreter)
if (${Python}_FIND_IMPLEMENTATIONS STREQUAL "IronPython")
find_python ("NONE" ${Python} ${OUT_VERSION_RANGE} COMPONENTS Compiler)
find_python ("NONE" ${OUT_VERSION_RANGE} COMPONENTS Compiler)
else()
find_python ("NONE" ${Python} ${OUT_VERSION_RANGE} COMPONENTS Development)
find_python ("NONE" ${OUT_VERSION_RANGE} COMPONENTS Development)
endif()
find_python ("NONE" ${Python} 5...6 COMPONENTS Interpreter)
find_python ("NONE" 5...6 COMPONENTS Interpreter)