diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-26 14:58:06 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-06-29 12:47:44 +0200 |
| commit | 5ccecd3a898565fbf2115acd9f721b949dbc8fcc (patch) | |
| tree | e99cfd7f9f7f12b9bf7a558dfd6aac5b98b37dcb /cmake/QtBuild.cmake | |
| parent | 2299b61d0ca83d7066d476a9930c6dfab8e8beb3 (diff) | |
CMake: Write host architecture and ABI to qconfig.pri
...when cross-building Qt.
Change-Id: I7d2fe83167fc278fde9f0c0fd70f5fa42fa62862
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtBuild.cmake')
| -rw-r--r-- | cmake/QtBuild.cmake | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/cmake/QtBuild.cmake b/cmake/QtBuild.cmake index 0f0a94ff54..a520bb6c3b 100644 --- a/cmake/QtBuild.cmake +++ b/cmake/QtBuild.cmake @@ -1157,9 +1157,24 @@ function(qt_generate_global_config_pri_file) ") endif() - string(APPEND content "QT_ARCH = ${TEST_architecture_arch} + if(CMAKE_CROSSCOMPILING) + string(APPEND content "host_build { + QT_ARCH = ${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_ARCH} + QT_BUILDABI = ${QT${PROJECT_VERSION_MAJOR}_HOST_INFO_BUILDABI} + QT_TARGET_ARCH = ${TEST_architecture_arch} + QT_TARGET_BUILDABI = ${TEST_buildAbi} +} else { + QT_ARCH = ${TEST_architecture_arch} + QT_BUILDABI = ${TEST_buildAbi} +} +") + else() + string(APPEND content "QT_ARCH = ${TEST_architecture_arch} QT_BUILDABI = ${TEST_buildAbi} -QT.global.enabled_features = ${corrected_enabled_features} +") + endif() + + string(APPEND content "QT.global.enabled_features = ${corrected_enabled_features} QT.global.disabled_features = ${corrected_disabled_features} QT.global.disabled_features += release build_all QT_CONFIG += ${qt_public_config_joined} |