diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-08-18 18:41:18 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-08-19 16:58:42 +0000 |
| commit | 77b655c5cfa9e4423b36f51f152967dc169fbc2d (patch) | |
| tree | 55d587259beabeb3f1ebc86eebf9f77d76ad5348 /cmake/qt.toolchain.cmake.in | |
| parent | 48954c9d0bf2ff7288a3d06f0200706813171c68 (diff) | |
CMake: Pass Qt6_FIND_VERSION in Qt6Config when looking for components
Pass Qt6_FIND_VERSION to components when the
find_package(Qt6 ${ver} COMPONENTS Foo) signature is used.
Create a ConfigVersion file for BuildInternals, so that BuildInternals
passes the version check.
Fix qt_configure_file to look in the _qt_6_config_cmake_dir folder for
the template file rather than Qt6_DIR, because Qt6_DIR might be
accidentally unset after a failed find_package(Qt6) call and the error
is not helpful then.
We already pass versions everywhere else when looking for
dependencies, like in ModuleDependencies.cmake.in,
PluginDependencies.cmake.in, ModuleToolsDependencies.cmake.in.
Fixes: QTBUG-91737
Change-Id: Ief1da0c6f239c935385e7ce662951e85ccfdf130
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
(cherry picked from commit 654431286931a70645fc3be39570f9109c95fe9e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake/qt.toolchain.cmake.in')
0 files changed, 0 insertions, 0 deletions