summaryrefslogtreecommitdiffstats
path: root/meta-boot2qt/files/configure-qtcreator.sh
diff options
context:
space:
mode:
authorTuomas Heimonen <tuomas.heimonen@qt.io>2018-08-14 10:29:17 +0300
committerTuomas Heimonen <tuomas.heimonen@qt.io>2018-09-10 06:57:20 +0000
commita0d9fb33f8475336fbdebdbab803f43c7b9107d4 (patch)
treeb89aa693d917976736a52dea805e91ad41afd7e2 /meta-boot2qt/files/configure-qtcreator.sh
parent8f8722d36a1341c08c86c4357da8f398cc31e771 (diff)
downloadmeta-boot2qt-a0d9fb33f8475336fbdebdbab803f43c7b9107d4.tar.gz
configure-qtcreator: Add CMake support for QtCreator
Add CMake tool to QtCreator configure script Task-number: QTPM-766 Change-Id: I1105284c532fc872cb622781ef1b3ab8b02a478d Reviewed-by: Samuli Piippo <samuli.piippo@qt.io>
Diffstat (limited to 'meta-boot2qt/files/configure-qtcreator.sh')
-rwxr-xr-xmeta-boot2qt/files/configure-qtcreator.sh12
1 files changed, 11 insertions, 1 deletions
diff --git a/meta-boot2qt/files/configure-qtcreator.sh b/meta-boot2qt/files/configure-qtcreator.sh
index 105e476..3e5db2d 100755
--- a/meta-boot2qt/files/configure-qtcreator.sh
+++ b/meta-boot2qt/files/configure-qtcreator.sh
@@ -100,6 +100,7 @@ ${SDKTOOL} rmQt --id ${BASEID}.qt || true
100${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true 100${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc || true
101${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true 101${SDKTOOL} rmTC --id ProjectExplorer.ToolChain.Gcc:${BASEID}.g++ || true
102${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true 102${SDKTOOL} rmDebugger --id ${BASEID}.gdb 2>/dev/null || true
103${SDKTOOL} rmCMake --id ${BASEID}.cmake 2>/dev/null || true
103 104
104if [ -n "${REMOVEONLY}" ]; then 105if [ -n "${REMOVEONLY}" ]; then
105 echo "Kit removed: ${NAME}" 106 echo "Kit removed: ${NAME}"
@@ -133,6 +134,11 @@ ${SDKTOOL} addQt \
133 --type "Qdb.EmbeddedLinuxQt" \ 134 --type "Qdb.EmbeddedLinuxQt" \
134 --qmake "$(type -p qmake)" 135 --qmake "$(type -p qmake)"
135 136
137${SDKTOOL} addCMake \
138 --id "${BASEID}.cmake" \
139 --name "CMake ${NAME}" \
140 --path "$(type -p cmake)"
141
136${SDKTOOL} addKit \ 142${SDKTOOL} addKit \
137 --id "${BASEID}.kit" \ 143 --id "${BASEID}.kit" \
138 --name "${NAME}" \ 144 --name "${NAME}" \
@@ -143,6 +149,10 @@ ${SDKTOOL} addKit \
143 --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \ 149 --Ctoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.gcc" \
144 --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \ 150 --Cxxtoolchain "ProjectExplorer.ToolChain.Gcc:${BASEID}.g++" \
145 --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \ 151 --icon ":/boot2qt/images/B2Qt_QtC_icon.png" \
146 --mkspec "${MKSPEC}" 152 --mkspec "${MKSPEC}" \
153 --cmake "${BASEID}.cmake" \
154 --cmake-config "CMAKE_TOOLCHAIN_FILE:FILEPATH=${OECORE_NATIVE_SYSROOT}/usr/share/cmake/OEToolchainConfig.cmake" \
155 --cmake-config "CMAKE_CXX_COMPILER:FILEPATH=$(type -p ${CXX})" \
156 --cmake-config "CMAKE_C_COMPILER:FILEPATH=$(type -p ${CC})"
147 157
148echo "Configured Qt Creator with new kit: ${NAME}" 158echo "Configured Qt Creator with new kit: ${NAME}"