diff options
| author | Brad King <brad.king@kitware.com> | 2020-11-04 13:15:31 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-11-04 13:15:47 (GMT) |
| commit | 39f32f12100a7f06f52cd53875b2a5729e9404a6 (patch) | |
| tree | bce6d94f91faf339d725957eb5ed17b3a18418df /Modules | |
| parent | 855bdc586c2c8c6ed029c6d0e370e19e0b2e6193 (diff) | |
| parent | 1c912056a1ae393183b06c4f9fdfc896d5bb469d (diff) | |
| download | CMake-39f32f12100a7f06f52cd53875b2a5729e9404a6.zip CMake-39f32f12100a7f06f52cd53875b2a5729e9404a6.tar.gz CMake-39f32f12100a7f06f52cd53875b2a5729e9404a6.tar.bz2 | |
Merge topic 'cmake_path-deactivation' into release-3.19
1c912056a1 cmake_path: remove new command from 3.19
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5459
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindPython/Support.cmake | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 2b911ae..028ce08 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -2997,9 +2997,8 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS unset(_${_PYTHON_PREFIX}_is_prefix) foreach (_${_PYTHON_PREFIX}_implementation IN LISTS _${_PYTHON_PREFIX}_FIND_IMPLEMENTATIONS) foreach (_${_PYTHON_PREFIX}_framework IN LISTS _${_PYTHON_PREFIX}_${_${_PYTHON_PREFIX}_implementation}_FRAMEWORKS) - cmake_path (IS_PREFIX _${_PYTHON_PREFIX}_framework "${${_PYTHON_PREFIX}_LIBRARY_RELEASE}" _${_PYTHON_PREFIX}_is_prefix) - if (_${_PYTHON_PREFIX}_is_prefix) - cmake_path (GET _${_PYTHON_PREFIX}_framework PARENT_PATH _${_PYTHON_PREFIX}_framework) + if (${_PYTHON_PREFIX}_LIBRARY_RELEASE MATCHES "^${_${_PYTHON_PREFIX}_framework}") + get_filename_component (_${_PYTHON_PREFIX}_framework "${_${_PYTHON_PREFIX}_framework}" DIRECTORY) set (${_PYTHON_PREFIX}_LINK_OPTIONS "LINKER:-rpath,${_${_PYTHON_PREFIX}_framework}") break() endif() |