Merge pull request microsoft#50 from fwcd/arm64-osx-qt-mkspec

Set `VCPKG_QT_HOST_MKSPEC` on arm64 macOS hosts explicitly
fwcd · Sep 24, 2022 · 727757e · 727757e
2 parents f9cdab3 + e6bfd7b
commit 727757e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake b/overlay/osx/qt5-base/cmake/find_qt_mkspec.cmake
@@ -56,6 +56,12 @@ function(find_qt_mkspec TARGET_PLATFORM_MKSPEC_OUT HOST_PLATFORM_MKSPEC_OUT EXT_
  #elseif("${CMAKE_HOST_SYSTEM}" STREQUAL "Darwin")
  # set(_tmp_host_out "macx-clang")
  #endif()
+ if(HOST_TRIPLET MATCHES "^arm64-osx")
+ # When compiling on Apple Silicon (arm64 macOS) hosts we need to
+ # set the host mkspec explicitly (since find_qt_mkspec won't do that
+ # for us and Qt 5.12's build system will default to using Rosetta otherwise).
+ set(_tmp_host_out "macx-aarch64-clang")
+ endif()
  if(DEFINED _tmp_host_out)
  message(STATUS "Host mkspec set to: ${_tmp_host_out}") 
  else()

diff --git a/overlay/osx/qt5-base/portfile.cmake b/overlay/osx/qt5-base/portfile.cmake
@@ -9,6 +9,7 @@ include(install_qt)
 
 #########################
 ## Find Host and Target mkspec name for configure
+
 include(find_qt_mkspec)
 find_qt_mkspec(TARGET_MKSPEC HOST_MKSPEC HOST_TOOLS)
 set(QT_PLATFORM_CONFIGURE_OPTIONS TARGET_PLATFORM ${TARGET_MKSPEC})