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
commit400a1b4a7b2b16fc0b46a1e3213e369fc0958658 (patch)
treed1a8fe3b2d025807fc0ea8b77150eee52895c39f
parentcb0f073d5f3ab99624507cbf3ba524ef81262bbf (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"