echo/CMake
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMakeFindFrameworks: Fix Brew 'Frameworks' path on Apple Silicon

Browse Source 
This approach is compatible with both Intel and Apple Silicon
architectures.

`/usr/local/Frameworks` was added in commit 9970cdcb59
(CMakeFindFrameworks: Allow custom framework locations, 2016-07-30,
v3.7.0-rc1~296^2) unconditionally, but does not work on Apple Silicon.

```
x86_64 (Intel macOS):
$ brew --prefix
/usr/local

arm64 (Apple Silicon macOS):
$ brew --prefix
/opt/homebrew
```
This commit is contained in:
Jean-Baptiste Noël 2022-08-29 19:40:10 +02:00 committed by Brad King
parent 8ac6634b2f
commit 5bfe33f092
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Modules/CMakeFindFrameworks.cmake
View File

@ -17,12 +17,19 @@ if(NOT CMAKE_FIND_FRAMEWORKS_INCLUDED)
macro(CMAKE_FIND_FRAMEWORKS fwk)
set(${fwk}_FRAMEWORKS)
if(APPLE)
# 'Frameworks' directory from Brew (Apple Silicon and Intel)
if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64")
set(_brew_framework_path /opt/homebrew/Frameworks)
else()
set(_brew_framework_path /usr/local/Frameworks)
endif()
file(TO_CMAKE_PATH "$ENV{CMAKE_FRAMEWORK_PATH}" _cmff_CMAKE_FRAMEWORK_PATH)
set(_cmff_search_paths
${CMAKE_FRAMEWORK_PATH}
${_cmff_CMAKE_FRAMEWORK_PATH}
~/Library/Frameworks
/usr/local/Frameworks
${_brew_framework_path}
/Library/Frameworks
/System/Library/Frameworks
/Network/Library/Frameworks