From dd7b741b811ad93ed8c9440c105bc1d22759c0c7 Mon Sep 17 00:00:00 2001 From: Marc Chevrier Date: Fri, 10 Jan 2020 13:32:50 +0100 Subject: macOS: Add support for new Xcode 11 frameworks directory Update CMAKE_SYSTEM_FRAMEWORK_PATH with new Xcode 11 frameworks directory --- Modules/Platform/Darwin.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 1482d76..e5a57b5 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 -- cgit v0.12 From fcde42751a6b33b57efc994347836258028fcadf Mon Sep 17 00:00:00 2001 From: Marc Chevrier Date: Fri, 10 Jan 2020 13:43:42 +0100 Subject: FindPython: ensure new Xcode framework for Python3 is detected --- Modules/FindPython/Support.cmake | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake index 1b5a9db..3b15354 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() -- cgit v0.12