diff options
| author | Brad King <brad.king@kitware.com> | 2020-01-13 15:20:43 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-01-13 10:20:58 -0500 |
| commit | 01b43e85cfece674e26069bf55903fb7521bad38 (patch) | |
| tree | 753004c32311f033adcc588b845d0a5423a3c311 | |
| parent | 9fa8b7d5dda04b94fe04e63626e393fd6bf0353e (diff) | |
| parent | fcde42751a6b33b57efc994347836258028fcadf (diff) | |
| download | cmake-01b43e85cfece674e26069bf55903fb7521bad38.tar.gz | |
Merge topic 'macOS-Xcode-11-frameworks' into release-3.16
fcde42751a FindPython: ensure new Xcode framework for Python3 is detected
dd7b741b81 macOS: Add support for new Xcode 11 frameworks directory
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4198
| -rw-r--r-- | Modules/FindPython/Support.cmake | 3 | ||||
| -rw-r--r-- | Modules/Platform/Darwin.cmake | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 1b5a9db567..3b15354d66 100644 --- a/Modules/FindPython/Support.cmake +++ b/Modules/FindPython/Support.cmake @@ -62,6 +62,9 @@ macro (_PYTHON_FIND_FRAMEWORKS) ${CMAKE_SYSTEM_FRAMEWORK_PATH}) list (REMOVE_DUPLICATES _pff_frameworks) foreach (_pff_framework IN LISTS _pff_frameworks) + if (EXISTS ${_pff_framework}/Python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}.framework) + list (APPEND ${_PYTHON_PREFIX}_FRAMEWORKS ${_pff_framework}/Python${_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR}.framework) + endif() if (EXISTS ${_pff_framework}/Python.framework) list (APPEND ${_PYTHON_PREFIX}_FRAMEWORKS ${_pff_framework}/Python.framework) endif() diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 1482d76ae6..e5a57b59fc 100644 --- a/Modules/Platform/Darwin.cmake +++ b/Modules/Platform/Darwin.cmake @@ -157,6 +157,10 @@ if(_CMAKE_OSX_SYSROOT_PATH) endif() endforeach() endif() +if (OSX_DEVELOPER_ROOT AND EXISTS "${OSX_DEVELOPER_ROOT}/Library/Frameworks") + list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH + ${OSX_DEVELOPER_ROOT}/Library/Frameworks) +endif() list(APPEND CMAKE_SYSTEM_FRAMEWORK_PATH /Library/Frameworks /Network/Library/Frameworks |