1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Quote CMAKE_OSX_SYSROOT when checking for simulator SDK

Browse Source 
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.9 6.8
Change-Id: Icad8e044a9d58e995882672b27340c83eb0ae0a8
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Tor Arne Vestbø 2025-04-25 20:23:58 +02:00
parent 56e0be45c7
commit 91ec68313a
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/Qt6CoreMacros.cmake
View File

@ -3565,7 +3565,7 @@ macro(qt6_standard_project_setup)
if(QT_OSX_ARCHITECTURES) if(QT_OSX_ARCHITECTURES)
list(LENGTH QT_OSX_ARCHITECTURES qt_osx_arch_count) list(LENGTH QT_OSX_ARCHITECTURES qt_osx_arch_count)
endif() 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 # Xcode expects the base SDK to be the device SDK
set(simulator_sysroot "${CMAKE_OSX_SYSROOT}") set(simulator_sysroot "${CMAKE_OSX_SYSROOT}")
string(REGEX REPLACE "simulator" "os" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}") string(REGEX REPLACE "simulator" "os" CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}")