diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2020-11-23 08:44:59 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-11-23 09:54:43 +0000 |
| commit | e8d8b1a5e4c451833fbee9582e36724ba1ed0aa9 (patch) | |
| tree | 552035b0838bd6ecb5ad33331bd54c01372f7236 /cmake | |
| parent | 5806ecf5cb24cf39ea2608d42246eafbaa817582 (diff) | |
CMake: Fix Android non-top-level build against qtbase
Commit 9e0fb9c4fbe7a11c09a70d7ea1be97405c6bf0f8 introduced build
failures in non-top-level builds when building Qt modules against
qtbase.
This was observed on in the CI for CentOS.
Partly revert above commit by taking the old code path for non-top-level
builds.
Fixes: QTBUG-88718
Change-Id: I8926e1e4628ec5bdcea99e10497c1f65c10d072d
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
(cherry picked from commit 510186a218e63c88100efc38cb1611f122f94570)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'cmake')
| -rw-r--r-- | cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake index 5216cebf66..bb2de0a0c2 100644 --- a/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake +++ b/cmake/QtBuildInternals/QtBuildInternalsConfig.cmake @@ -570,5 +570,10 @@ macro(qt_examples_build_end) endmacro() if (ANDROID) - include(QtBuildInternals/QtBuildInternalsAndroid) + if(QT_SUPERBUILD) + include(QtBuildInternals/QtBuildInternalsAndroid) + else() + ### TODO: Find out why this is needed. See QTBUG-88718. + include(${CMAKE_CURRENT_LIST_DIR}/QtBuildInternalsAndroid.cmake) + endif() endif() |