From 1fae7f35529b7b79dff8a20c12fc80a0d0245f37 Mon Sep 17 00:00:00 2001 From: Joerg Bornemann Date: Thu, 19 Nov 2020 13:41:01 +0100 Subject: 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 (cherry picked from commit 9e0fb9c4fbe7a11c09a70d7ea1be97405c6bf0f8) Reviewed-by: Qt Cherry-pick Bot --- cmake/QtBuildInternals/QtBuildInternalsConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'cmake') 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() -- cgit v1.2.3