diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2022-01-10 10:12:32 -0800 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2022-05-04 15:20:35 +0200 |
| commit | acfbe3b7795c741b269fc23ed2c51c5937cd7f4f (patch) | |
| tree | 9c54ea5272d1c0ddc8e162a1d09f6b42ee90987d /cmake/QtQmakeHelpers.cmake | |
| parent | 634717135da2e8130e1677176c83ece478f1d87f (diff) | |
CMake: also allow building tools when found elsewhere in host builds
Previously, this was only supported when cross-compiling, but that's an
unnecessary limitation. Instead, make it possible to build the "host"
tools (notably qmake) even when they've been found elsewhere due to
QT_FORCE_FIND_TOOLS=ON and a supplied QT_HOST_PATH.
The combination of QT_FORCE_FIND_TOOLS and QT_FORCE_BUILD_TOOLS set to
ON is useful for developers who touch content that ends up in the
bootstrap library.
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING is deprecated in favor of
QT_FORCE_BUILD_TOOLS.
[ChangeLog][CMake] QT_BUILD_TOOLS_WHEN_CROSSCOMPILING has been
deprecated in favor of QT_FORCE_BUILD_TOOLS. The latter can be used in
combination with QT_FORCE_FIND_TOOLS and QT_HOST_PATH to use tools from
a host Qt even for a non-cross build and still build the tools.
Fixes: QTBUG-99683
Change-Id: I0e5f6bec596a4a78bd3bfffd16c8fb486181f9b6
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'cmake/QtQmakeHelpers.cmake')
| -rw-r--r-- | cmake/QtQmakeHelpers.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/QtQmakeHelpers.cmake b/cmake/QtQmakeHelpers.cmake index 229c3a0fb4..20b2504375 100644 --- a/cmake/QtQmakeHelpers.cmake +++ b/cmake/QtQmakeHelpers.cmake @@ -85,7 +85,7 @@ function(qt_generate_qmake_and_qtpaths_wrapper_for_target) # Call the configuration file something else but qt.conf to avoid # being picked up by the qmake executable that's created if - # QT_BUILD_TOOLS_WHEN_CROSSCOMPILING is enabled. + # QT_FORCE_BUILD_TOOLS is enabled. qt_path_join(qt_conf_path "${INSTALL_BINDIR}" "target_qt.conf") set(prefix "${CMAKE_INSTALL_PREFIX}") @@ -146,7 +146,7 @@ HostSpec=${QT_QMAKE_HOST_MKSPEC} endif() set(wrapper_prefix) - if(QT_BUILD_TOOLS_WHEN_CROSSCOMPILING) + if(QT_FORCE_BUILD_TOOLS) # Avoid collisions with the cross-compiled qmake/qtpaths binaries. set(wrapper_prefix "host-") endif() |