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

CMake: Export the chosen iOS SDK used when configuring Qt

Browse Source 
The value is used by mkspecs/features/mac/default_post.prf and
ultimately by xcodebuild to decide which arch and SDK to build
against.

For a simulator_and_device build, no value needs to be set as far as
I can see.

Task-number: QTBUG-87218
Change-Id: I41992bec6b16aadfd87c3f7c10653a6094e76d3e
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor 2020-10-06 17:50:13 +02:00
parent 98cc32d93e
commit 4270522916
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/QtPriHelpers.cmake
View File

@ -567,6 +567,10 @@ function(qt_generate_global_device_pri_file)
string(APPEND content "DEFAULT_ANDROID_ABIS = ${ANDROID_ABI}\n")
endif()
if(QT_UIKIT_SDK)
string(APPEND content "QMAKE_MAC_SDK = ${QT_UIKIT_SDK}\n")
endif()
set(gcc_machine_dump "")
if(TEST_machine_tuple)
set(gcc_machine_dump "${TEST_machine_tuple}")