1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Fix Android non-top-level build against qtbase

Browse Source 
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>
This commit is contained in:
Joerg Bornemann 2020-11-23 08:44:59 +01:00 committed by Qt Cherry-pick Bot
parent 5806ecf5cb
commit e8d8b1a5e4
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cmake/QtBuildInternals/QtBuildInternalsConfig.cmake
View File

@ -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()