mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-05 13:20:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

FindPython: Add support for pypy v7.3.9 and uppers

Browse Source 
Library name versioning has changed.

Fixes: #23439
This commit is contained in:
Marc Chevrier
2022-04-20 15:24:19 +02:00
parent 33c6d01e82
commit 5440eafaae
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modules/FindPython/Support.cmake
View File

@@ -415,7 +415,6 @@ function (_PYTHON_GET_NAMES _PYTHON_PGN_NAMES)
if (_PGN_WIN32) if (_PGN_WIN32)
foreach (version IN LISTS _PGN_VERSION) foreach (version IN LISTS _PGN_VERSION)
string (REPLACE "." "" version_no_dots ${version}) string (REPLACE "." "" version_no_dots ${version})
set (name "python${version_no_dots}") set (name "python${version_no_dots}")
if (_PGN_DEBUG) if (_PGN_DEBUG)
string (APPEND name "_d") string (APPEND name "_d")
@@ -423,6 +422,13 @@ function (_PYTHON_GET_NAMES _PYTHON_PGN_NAMES)
list (APPEND names "${name}") list (APPEND names "${name}")
endforeach() endforeach()
endif() endif()
if (_PGN_POSIX)
foreach(version IN LISTS _PGN_VERSION)
list (APPEND names "pypy${version}-c")
endforeach()
endif()
list (APPEND names ${_${_PYTHON_PREFIX}_PYPY_LIB_NAMES}) list (APPEND names ${_${_PYTHON_PREFIX}_PYPY_LIB_NAMES})
endif() endif()
endif() endif()
@@ -588,6 +594,11 @@ function (_PYTHON_GET_VERSION)
set (${_PGV_PREFIX}VERSION_MINOR "${CMAKE_MATCH_2}" PARENT_SCOPE) set (${_PGV_PREFIX}VERSION_MINOR "${CMAKE_MATCH_2}" PARENT_SCOPE)
set (${_PGV_PREFIX}VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" PARENT_SCOPE) set (${_PGV_PREFIX}VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" PARENT_SCOPE)
set (${_PGV_PREFIX}ABI "${CMAKE_MATCH_3}" PARENT_SCOPE) set (${_PGV_PREFIX}ABI "${CMAKE_MATCH_3}" PARENT_SCOPE)
elseif (library_name MATCHES "pypy([23])\\.([0-9]+)-c")
set (${_PGV_PREFIX}VERSION_MAJOR "${CMAKE_MATCH_1}" PARENT_SCOPE)
set (${_PGV_PREFIX}VERSION_MINOR "${CMAKE_MATCH_2}" PARENT_SCOPE)
set (${_PGV_PREFIX}VERSION "${CMAKE_MATCH_1}.${CMAKE_MATCH_2}" PARENT_SCOPE)
set (${_PGV_PREFIX}ABI "" PARENT_SCOPE)
elseif (library_name MATCHES "pypy(3)?-c") elseif (library_name MATCHES "pypy(3)?-c")
set (version "${CMAKE_MATCH_1}") set (version "${CMAKE_MATCH_1}")
# try to pick-up a more precise version from the path # try to pick-up a more precise version from the path