diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 13:11:00 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-04-15 14:24:59 +0200 |
| commit | 6cefc83875feea4fd795afebef158fc3f30c27c7 (patch) | |
| tree | a970cd560ab553f253afccc468fd229f35def577 /cmake | |
| parent | 9471febddfa66eaf5cacaf7c6cb43e769f4f7712 (diff) | |
CMake: Don't consider /opt/homebrew as a system path for arm64 macOS
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 f3c7d22dd04afe8d889585fb5d6426f3d4591e74
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>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 1065ecd0e3..1953454b23 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -193,6 +193,7 @@ function(qt_build_internals_set_up_system_prefixes) list(REMOVE_ITEM CMAKE_SYSTEM_PREFIX_PATH "/usr/local" # Homebrew + "/opt/homebrew" # Apple Silicon Homebrew "/usr/X11R6" "/usr/pkg" "/opt" |