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

Revert "CMake: Improve Xcode projects for single SDK builds on Apple platforms"

Browse Source 
This reverts commit 5898e0e4f14d1e6d0b0fc09e122346d817cb821a.

Likely broke a CMake deployment test in qtdeclarative.

Change-Id: I90c8343f0657845dd514e573b7333f441b70cc9e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Tor Arne Vestbø 2024-04-16 10:46:03 +00:00 committed by The Qt Project
parent e52883d77d
commit f6777af17d
1 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/corelib/Qt6CoreMacros.cmake
View File

@ -3474,17 +3474,6 @@ macro(qt6_standard_project_setup)
if(NOT DEFINED QT_I18N_SOURCE_LANGUAGE)
set(QT_I18N_SOURCE_LANGUAGE ${__qt_sps_arg_I18N_SOURCE_LANGUAGE})
endif()
# Ensure we always use device SDK for Xcode
if(CMAKE_GENERATOR STREQUAL "Xcode")
if(${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}")
set(CMAKE_OSX_SYSROOT "${CMAKE_OSX_SYSROOT}" CACHE STRING "" FORCE)
set(CMAKE_XCODE_ATTRIBUTE_SUPPORTED_PLATFORMS "${simulator_sysroot}")
endif()
endif()
endif()
endmacro()