diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-19 13:41:01 +0100 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-20 16:05:55 +0000 |
| commit | 9e0fb9c4fbe7a11c09a70d7ea1be97405c6bf0f8 (patch) | |
| tree | 62a5066cce896bdf53c61223251c68034fe939ea /cmake | |
| parent | 85f0792d2b10994e9e5fa70de50aa0ac39e98e20 (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.
Pick-to: 6.0 6.0.0
Task-number: QTBUG-88460
Change-Id: If06ac715fae3c2bebbeffca44b7e07265ffb0f71
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
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 f7f9f3ccbf..a7b86ed606 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -570,5 +570,5 @@ macro(qt_examples_build_end) endmacro() if (ANDROID) - include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsAndroid.cmake) + include(QtBuildInternals/QtBuildInternalsAndroid) endif() |