AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

CMake: Don't consider /opt/homebrew as a system path for arm64 macOS

Browse Source 
Homebrew introduced a new default prefix for Apple Silicon machines,
so that both arm64 and x86_64 packages can be co-installed on a single
system.
The intel packages are installed into /usr/local and the arm64
packages are installed into /opt/homebrew.

For Qt building purposes, we don't want to find packages in any of
homebrew's prefixes unless explicitly requested by the user

Currently our arm64 macOS CI config does pick up system libs under new
prefix.
Remove the new path from the system prefixes.

Amends f3c7d22dd0

Task-number: QTBUG-85447
Change-Id: I381d31c95bcdab26147a331444ba40c7af9d0a95
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Alexandru Croitor 2021-04-15 13:11:00 +02:00
parent 9471febddf
commit 6cefc83875
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -193,6 +193,7 @@ function(qt_build_internals_set_up_system_prefixes)
list(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH list(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH
"/usr/local" # Homebrew "/usr/local" # Homebrew
"/opt/homebrew" # Apple Silicon Homebrew
"/usr/X11R6" "/usr/X11R6"
"/usr/pkg" "/usr/pkg"
"/opt" "/opt"