diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2020-09-02 15:41:16 +0200 |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2020-09-02 15:41:16 +0200 |
| commit | 6fdfe2428d70bbd7f264ca1010c7ce2e992e4ab3 (patch) | |
| tree | 4d76c286ea276d007644f0d34774c672efc38eae | |
| parent | 7da3c744e3f39bb19358fd2f19807443c89919af (diff) | |
| download | cmake-6fdfe2428d70bbd7f264ca1010c7ce2e992e4ab3.tar.gz | |
FindPython: enhance ABI checks against include directory
Fixes: #21149
| -rw-r--r-- | Modules/FindPython/Support.cmake | 26 |
1 files changed, 18 insertions, 8 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 1d68c44156..6dd3b8ed0a 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -607,14 +607,24 @@ function (_PYTHON_GET_VERSION) # ABI not used on Windows set (abi "") else() - if (config MATCHES "#[ ]*define[ ]+Py_DEBUG[ ]+1") - string (APPEND abi "d") - endif() - if (config MATCHES "#[ ]*define[ ]+WITH_PYMALLOC[ ]+1") - string (APPEND abi "m") - endif() - if (config MATCHES "#[ ]*define[ ]+Py_UNICODE_SIZE[ ]+4") - string (APPEND abi "u") + if (NOT config) + # pyconfig.h can be a wrapper to a platform specific pyconfig.h + # In this case, try to identify ABI from include directory + if (_${_PYTHON_PREFIX}_INCLUDE_DIR MATCHES "python${version_major}\.${version_minor}+([dmu]*)") + set (abi "${CMAKE_MATCH_1}") + else() + set (abi "") + endif() + else() + if (config MATCHES "#[ ]*define[ ]+Py_DEBUG[ ]+1") + string (APPEND abi "d") + endif() + if (config MATCHES "#[ ]*define[ ]+WITH_PYMALLOC[ ]+1") + string (APPEND abi "m") + endif() + if (config MATCHES "#[ ]*define[ ]+Py_UNICODE_SIZE[ ]+4") + string (APPEND abi "u") + endif() endif() set (${_PGV_PREFIX}ABI "${abi}" PARENT_SCOPE) endif() |