diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-05-11 15:17:40 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-05-11 18:53:37 +0200 |
| commit | 7f94aa23f59dde48de0e070aea2734939de3e6a1 (patch) | |
| tree | 8e098ebfd59d0e2b745c7a80eaa51c4aaa592838 /cmake/QtSetup.cmake | |
| parent | 03782af2dd322ea99de8304bf27e76b32c5e3753 (diff) | |
CMake: Fix initialization of QT_BUILD_TOOLS_BY_DEFAULT
...when QT_BUILD_TOOLS_WHEN_CROSSCOMPILING is ON.
When QT_BUILD_TOOLS_WHEN_CROSSCOMPILING is ON, we want to set
QT_FORCE_BUILD_TOOLS. But this happened too late: after the
initialization of QT_BUILD_TOOLS_BY_DEFAULT. This value depends on
QT_FORCE_BUILD_TOOLS.
This amends commit acfbe3b7795c741b269fc23ed2c51c5937cd7f4f.
Change-Id: Ibdba54da943aea1b55618f10d2b8485f4390878a
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'cmake/QtSetup.cmake')
| -rw-r--r-- | cmake/QtSetup.cmake | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake index 1c3f03318f..a0674df0a9 100644 --- a/cmake/QtSetup.cmake +++ b/cmake/QtSetup.cmake @@ -212,6 +212,14 @@ if(QT_BUILD_STANDALONE_TESTS) endif() set(BUILD_TESTING ${QT_BUILD_TESTS} CACHE INTERNAL "") +# QT_BUILD_TOOLS_WHEN_CROSSCOMPILING -> QT_FORCE_BUILD_TOOLS +# pre-6.4 compatibility flag (remove sometime in the future) +if(CMAKE_CROSSCOMPILING AND QT_BUILD_TOOLS_WHEN_CROSSCOMPILING) + message(WARNING "QT_BUILD_TOOLS_WHEN_CROSSCOMPILING is deprecated. " + "Please use QT_FORCE_BUILD_TOOLS instead.") + set(QT_FORCE_BUILD_TOOLS TRUE CACHE INTERNAL "" FORCE) +endif() + # When cross-building, we don't build tools by default. Sometimes this also covers Qt apps as well. # Like in qttools/assistant/assistant.pro, load(qt_app), which is guarded by a qtNomakeTools() call. |