diff options
| author | Brad King <brad.king@kitware.com> | 2023-03-21 12:55:51 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-03-21 08:56:07 -0400 |
| commit | 4b9bf10c4d6f674421ff32ff68fd573d314a884a (patch) | |
| tree | 39b4ea3260a3001683630e1b8552da3b6e904491 /Modules | |
| parent | 88efbdab5f43c6c85ed1672fd2e2df8c3be460f6 (diff) | |
| parent | 8a71c88d4d4aa4805713a0266f83f3fcd48f91de (diff) | |
| download | cmake-4b9bf10c4d6f674421ff32ff68fd573d314a884a.tar.gz | |
Merge topic 'FindPython-SOSABI-handling'
8a71c88d4d Merge branch 'backport-3.26-FindPython-SOSABI-handling'
4c902d675b FindPython: ensure Stable ABI is correctly handled
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8345
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPython.cmake | 2 | ||||
| -rw-r--r-- | Modules/FindPython/Support.cmake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindPython.cmake b/Modules/FindPython.cmake index fd2eeaa33b..31ef1c7d53 100644 --- a/Modules/FindPython.cmake +++ b/Modules/FindPython.cmake @@ -542,7 +542,7 @@ If the library type is not specified, ``MODULE`` is assumed. was introduced. Specifying only major version ``3`` is equivalent to ``3.2``. When option ``WITH_SOABI`` is also specified, the module suffix will include - the ``Python3_SOSABI`` value, if any. + the ``Python_SOSABI`` value, if any. #]=======================================================================] diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index f1be0f4dae..517ac21eb7 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -579,7 +579,7 @@ function (_PYTHON_GET_CONFIG_VAR _PYTHON_PGCV_VALUE NAME) endif() endif() elseif (NAME STREQUAL "SOSABI") - execute_process (COMMAND ${_${_PYTHON_PREFIX}_INTERPRETER_LAUNCHER} "${_${_PYTHON_PREFIX}_EXECUTABLE}" -c "import sys\nimport re\nimport importlib\nsys.stdout.write(next(filter(lambda x: re.search('^\\.abi', x), importlib.machinery.EXTENSION_SUFFIXES)))" + execute_process (COMMAND ${_${_PYTHON_PREFIX}_INTERPRETER_LAUNCHER} "${_${_PYTHON_PREFIX}_EXECUTABLE}" -c "import sys\nimport re\nimport importlib.machinery\nsys.stdout.write(next(filter(lambda x: re.search('^\\.abi', x), importlib.machinery.EXTENSION_SUFFIXES)))" RESULT_VARIABLE _result OUTPUT_VARIABLE _values ERROR_QUIET |