aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-11-05 15:18:52 +0200
committerSamuli Piippo <samuli.piippo@qt.io>2021-11-08 05:20:06 +0200
commit3bb76773a835b96a6f9fe4fc3c2bd0b2fa176432 (patch)
treec53ca1fca2f81d9fa44880fad4e5572dc4001651
parentd0e7002304006fde9086974e15793837ae90a5c0 (diff)
qtbase-native: don't try to find tools
QT_BUILD_TOOLS_WHEN_CROSSCOMPILING triggered qtbase-native to try to find tools from QT_HOST_PATH, which obviously doesn't exists yet. Use it only for target and nativesdk builds. Fixes compilation failure: | -- Searching for tool 'Qt6::moc' in package Qt6CoreTools. | CMake Error at cmake/QtToolHelpers.cmake:122 (message): | Neither QT_HOST_PATH_CMAKE_DIR nor Qt6HostInfo_DIR} available. Pick-to: 6.2 Change-Id: I260526c08f48f179049eb4b0ab3e6561958d0a53 Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
-rw-r--r--classes/qt6-cmake.bbclass3
1 files changed, 2 insertions, 1 deletions
diff --git a/classes/qt6-cmake.bbclass b/classes/qt6-cmake.bbclass
index a7c7438..bfa3635 100644
--- a/classes/qt6-cmake.bbclass
+++ b/classes/qt6-cmake.bbclass
@@ -4,14 +4,15 @@ DEPENDS:prepend = "qtbase-native "
EXTRA_OECMAKE += "\
-DQT_CMAKE_DEBUG_EXTEND_TARGET=ON \
- -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
-DQT_BUILD_INTERNALS_NO_FORCE_SET_INSTALL_PREFIX=ON \
"
EXTRA_OECMAKE:append:class-target = "\
-DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}/${prefix_native}/ \
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
"
EXTRA_OECMAKE:append:class-nativesdk = "\
-DQT_HOST_PATH:PATH=${RECIPE_SYSROOT_NATIVE}/${prefix_native}/ \
+ -DQT_BUILD_TOOLS_WHEN_CROSSCOMPILING=ON \
"
EXTRA_OECMAKE += "\