aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2022-03-11 10:18:09 +0000
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2022-03-16 14:31:38 +0000
commitfd37fd69918efd93d81be68fe274437e07b7e189 (patch)
treeb80c8398023b418dee1f847db85a77206c287d57
parent1625dbe18df5fda76e6d312a9120ea1ec5df673a (diff)
qtbase: enable scripts for mingw toolchain
Make sure the qt-cmake* helper scripts get correctly created for mingw toolchains. Change-Id: I0ec6c4e12abf375677226ea32a6c36066a990f3b Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 3d122c668c9330016bb057518cf825fbc80fc040) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rw-r--r--recipes-qt/qt6/qtbase_git.bb5
1 files changed, 5 insertions, 0 deletions
diff --git a/recipes-qt/qt6/qtbase_git.bb b/recipes-qt/qt6/qtbase_git.bb
index bb9cf61..ced395b 100644
--- a/recipes-qt/qt6/qtbase_git.bb
+++ b/recipes-qt/qt6/qtbase_git.bb
@@ -134,6 +134,10 @@ EXTRA_OECMAKE:append:class-target = "\
${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', '-DFEATURE_use_gold_linker=ON', '-DFEATURE_use_bfd_linker=ON', d)} \
"
+EXTRA_OECMAKE:append:mingw32 = "\
+ -DQT_GENERATE_WRAPPER_SCRIPTS_FOR_ALL_HOSTS=ON \
+"
+
SYSROOT_DIRS += "${QT6_INSTALL_MKSPECSDIR}"
do_install:append() {
@@ -157,6 +161,7 @@ EOF
RELPATH="${@os.path.relpath(d.getVar('bindir'), d.getVar('QT6_INSTALL_BINDIR'))}"
sed -i ${D}${QT6_INSTALL_BINDIR}/* \
+ -e "s|cmake_path=${RECIPE_SYSROOT_NATIVE}.*cmake|cmake_path=%script_dir_path%/$RELPATH/cmake.exe|" \
-e "s|${RECIPE_SYSROOT_NATIVE}.*cmake|\$script_dir_path/$RELPATH/cmake|"
RELPATH=${@os.path.relpath(d.getVar('prefix') + '/share/cmake/Qt6Toolchain.cmake', d.getVar('QT6_INSTALL_LIBDIR') + '/cmake/Qt6')}