Просмотр исходного кода

Merge topic 'CMakeFindFrameworks-brew-arm64'

5bfe33f092 CMakeFindFrameworks: Fix Brew 'Frameworks' path on Apple Silicon

Acked-by: Kitware Robot <[email protected]>
Merge-request: !7618
Brad King 3 лет назад
Родитель
Сommit
4f91d9d2c7
1 измененных файлов с 8 добавлено и 1 удалено
  1. 8 1
      Modules/CMakeFindFrameworks.cmake

+ 8 - 1
Modules/CMakeFindFrameworks.cmake

@@ -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