aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2021-12-29 10:12:34 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-12-29 10:13:12 +0000
commit980425028e4aabaff1fe0fe898bc81e290bc4e3e (patch)
treee7e266e4f7e7723d64476de04b9e44dde3478334
parent9e868baff52d4eada742c52eb04ebf9939dc6d27 (diff)
qtcreator: add default cmake configurations for QtCreator
Keep QtCreator happy and warning free by adding the default CMake configuration that would be there if we didn't add any of our own. Change-Id: Iccf2c5a5ca217135093dd822394e59595ab8af7e Reviewed-by: Mikko Gronoff <mikko.gronoff@qt.io> (cherry picked from commit 94d0917061f7ebe64bb5e174291fdd2bf91a1249) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
-rwxr-xr-xmeta-boot2qt/files/configure-qtcreator.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 13c6fde0..8ce93109 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -149,6 +149,10 @@ ${SDKTOOL} addKit \
--icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
--mkspec "${MKSPEC}" \
--cmake "${BASEID}.cmake" \
+ --cmake-config "CMAKE_CXX_COMPILER:STRING=%{Compiler:Executable:Cxx}" \
+ --cmake-config "CMAKE_C_COMPILER:STRING=%{Compiler:Executable:C}" \
+ --cmake-config "CMAKE_PREFIX_PATH:STRING=%{Qt:QT_INSTALL_PREFIX}" \
+ --cmake-config "QT_QMAKE_EXECUTABLE:STRING=%{Qt:qmakeExecutable}" \
--cmake-config "CMAKE_TOOLCHAIN_FILE:FILEPATH=${OECORE_NATIVE_SYSROOT}/usr/share/cmake/Qt6Toolchain.cmake" \
--cmake-config "CMAKE_MAKE_PROGRAM:FILEPATH=$(type -p ninja)" \
--cmake-generator "Ninja"