diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake index 58e134801e..797891b9f5 100644 --- a/Modules/FindPython.cmake +++ b/Modules/FindPython.cmake @@ -332,7 +332,8 @@ Hints .. note:: - If ``Python_FIND_ABI`` is not defined, any ABI will be searched. + If ``Python3_FIND_ABI`` is not defined, any ABI, excluding the + ``gil_disabled`` flag, will be searched. From this 4-tuple, various ABIs will be searched starting from the most specialized to the most general. Moreover, when ``ANY`` is specified for diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 35a1d67938..faca5ae98a 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -225,19 +225,14 @@ function (_PYTHON_GET_REGISTRIES _PYTHON_PGR_REGISTRY_PATHS) endfunction() -function (_PYTHON_GET_ABIFLAGS _PGABIFLAGS) - if (NOT DEFINED _${_PYTHON_PREFIX}_FIND_ABI) - set (${_PGABIFLAGS} "" PARENT_SCOPE) - return() - endif() - +function (_PYTHON_GET_ABIFLAGS _PGA_FIND_ABI _PGABIFLAGS) set (abiflags "") - list (GET _${_PYTHON_PREFIX}_FIND_ABI 0 pydebug) - list (GET _${_PYTHON_PREFIX}_FIND_ABI 1 pymalloc) - list (GET _${_PYTHON_PREFIX}_FIND_ABI 2 unicode) - list (LENGTH _${_PYTHON_PREFIX}_FIND_ABI find_abi_length) + list (GET _PGA_FIND_ABI 0 pydebug) + list (GET _PGA_FIND_ABI 1 pymalloc) + list (GET _PGA_FIND_ABI 2 unicode) + list (LENGTH _PGA_FIND_ABI find_abi_length) if (find_abi_length GREATER 3) - list (GET _${_PYTHON_PREFIX}_FIND_ABI 3 gil) + list (GET _PGA_FIND_ABI 3 gil) else() set (gil "OFF") endif() @@ -302,12 +297,8 @@ function (_PYTHON_GET_PATH_SUFFIXES _PYTHON_PGPS_PATH_SUFFIXES) set (_PGPS_IMPLEMENTATIONS ${_${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS}) endif() - if (DEFINED _${_PYTHON_PREFIX}_ABIFLAGS) - set (abi "${_${_PYTHON_PREFIX}_ABIFLAGS}") - list (TRANSFORM abi REPLACE "^$" "") - else() - set (abi "mu" "m" "u" "") - endif() + set (abi "${_${_PYTHON_PREFIX}_ABIFLAGS}") + list (TRANSFORM abi REPLACE "^$" "") set (path_suffixes) @@ -401,12 +392,8 @@ function (_PYTHON_GET_NAMES _PYTHON_PGN_NAMES) else() string (REPLACE "." "" name_version ${version}) endif() - if (DEFINED _${_PYTHON_PREFIX}_ABIFLAGS) - set (abi "${_${_PYTHON_PREFIX}_ABIFLAGS}") - list (TRANSFORM abi REPLACE "^$" "") - else() - set (abi "") - endif() + set (abi "${_${_PYTHON_PREFIX}_ABIFLAGS}") + list (TRANSFORM abi REPLACE "^$" "") if (abi) set (abinames "${abi}") list (TRANSFORM abinames PREPEND "python${name_version}") @@ -420,16 +407,8 @@ function (_PYTHON_GET_NAMES _PYTHON_PGN_NAMES) endif() if (_PGN_POSIX) - if (DEFINED _${_PYTHON_PREFIX}_ABIFLAGS) - set (abi "${_${_PYTHON_PREFIX}_ABIFLAGS}") - list (TRANSFORM abi REPLACE "^$" "") - else() - if (_PGN_INTERPRETER OR _PGN_CONFIG) - set (abi "") - else() - set (abi "mu" "m" "u" "") - endif() - endif() + set (abi "${_${_PYTHON_PREFIX}_ABIFLAGS}") + list (TRANSFORM abi REPLACE "^$" "") if (abi) if (_PGN_CONFIG AND DEFINED CMAKE_LIBRARY_ARCHITECTURE) @@ -1529,7 +1508,6 @@ if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR VERSION_LESS "3") set (_${_PYTHON_PREFIX}_ABIFLAGS "") else() unset (_${_PYTHON_PREFIX}_FIND_ABI) - unset (_${_PYTHON_PREFIX}_ABIFLAGS) if (DEFINED ${_PYTHON_PREFIX}_FIND_ABI) # normalization string (TOUPPER "${${_PYTHON_PREFIX}_FIND_ABI}" _${_PYTHON_PREFIX}_FIND_ABI) @@ -1539,8 +1517,14 @@ else() message (AUTHOR_WARNING "Find${_PYTHON_PREFIX}: ${${_PYTHON_PREFIX}_FIND_ABI}: invalid value for '${_PYTHON_PREFIX}_FIND_ABI'. Ignore it") unset (_${_PYTHON_PREFIX}_FIND_ABI) endif() + _python_get_abiflags ("${${_PYTHON_PREFIX}_FIND_ABI}" _${_PYTHON_PREFIX}_ABIFLAGS) + else() + if (WIN32) + _python_get_abiflags ("OFF;OFF;OFF;OFF" _${_PYTHON_PREFIX}_ABIFLAGS) + else() + _python_get_abiflags ("ANY;ANY;ANY;OFF" _${_PYTHON_PREFIX}_ABIFLAGS) + endif() endif() - _python_get_abiflags (_${_PYTHON_PREFIX}_ABIFLAGS) endif() unset (${_PYTHON_PREFIX}_SOABI) unset (${_PYTHON_PREFIX}_SOSABI) diff --git a/Modules/FindPython3.cmake b/Modules/FindPython3.cmake index 55d33a2483..19b022461d 100644 --- a/Modules/FindPython3.cmake +++ b/Modules/FindPython3.cmake @@ -330,7 +330,8 @@ Hints .. note:: - If ``Python3_FIND_ABI`` is not defined, any ABI will be searched. + If ``Python3_FIND_ABI`` is not defined, any ABI, excluding the + ``gil_disabled`` flag, will be searched. From this 4-tuple, various ABIs will be searched starting from the most specialized to the most general. Moreover, when ``ANY`` is specified for