From 88666133731ac5f742450770180c8b61fa4f08b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 25 Apr 2025 20:23:58 +0200 Subject: [PATCH] Quote CMAKE_OSX_SYSROOT when checking for simulator SDK With CMake 4.0 the CMAKE_OSX_SYSROOT is no longer automatically set based on the CMAKE_OSX_DEPLOYMENT_TARGET or host platform, so the variable will be empty by default. Pick-to: 6.8 Change-Id: Icad8e044a9d58e995882672b27340c83eb0ae0a8 Reviewed-by: Alexandru Croitor Reviewed-by: Joerg Bornemann (cherry picked from commit 91ec68313ae8a90fcc97e669e1cf386c952aa41f) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/Qt6CoreMacros.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/corelib/Qt6CoreMacros.cmake b/src/corelib/Qt6CoreMacros.cmake index 7e6a2ca4110..d28189f25bc 100644 --- a/src/corelib/Qt6CoreMacros.cmake +++ b/src/corelib/Qt6CoreMacros.cmake @@ -3541,7 +3541,7 @@ macro(qt6_standard_project_setup) if(QT_OSX_ARCHITECTURES) list(LENGTH QT_OSX_ARCHITECTURES qt_osx_arch_count) endif() - if(NOT qt_osx_arch_count GREATER 1 AND ${CMAKE_OSX_SYSROOT} MATCHES "^[a-z]+simulator$") + if(NOT qt_osx_arch_count GREATER 1 AND "${CMAKE_OSX_SYSROOT}" MATCHES "^[a-z]+simulator$") # Xcode expects the base SDK to be the device SDK set(simulator_sysroot "${CMAKE_OSX_SYSROOT}") string(REGEX REPLACE "simulator" "os" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")