diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-19 13:41:01 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-20 19:46:16 +0000 |
| commit | 1fae7f35529b7b79dff8a20c12fc80a0d0245f37 (patch) | |
| tree | d21aca397e3aa80e198686ead2bc60b40bf37510 /cmake | |
| parent | 02c6d57cabecb0624768eeb31e74ec2e9c93f59e (diff) | |
CMake: Fix Android top-level prefix build
During a top-level prefix build, while configuring qtsvg,
Qt6BuildInternalsConfig tries to include QtBuildInternalsAndroid.cmake
but such files are not copied by qt_copy_or_install() at configure
time.
We need to use the "module" form of include() to take CMAKE_MODULE_PATH
into account. Then QtBuildInternalsAndroid.cmake can be loaded from the
source tree.
The include's current form was introduced in commit
3cb9ee3a5b36e2c10dbaf1564852472e7e02a1ae without further
explanation. Assuming an accidental change.
Task-number: QTBUG-88460
Change-Id: If06ac715fae3c2bebbeffca44b7e07265ffb0f71
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
(cherry picked from commit 9e0fb9c4fbe7a11c09a70d7ea1be97405c6bf0f8)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 5e49a99f5d..3bfe6c1cb2 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -523,5 +523,5 @@ macro(qt_examples_build_end) endmacro() if (ANDROID) - include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsAndroid.cmake) + include(QtBuildInternals/QtBuildInternalsAndroid) endif() |