diff options
author | Tuomas Heimonen <tuomas.heimonen@qt.io> | 2018-08-14 10:29:17 +0300 |
---|---|---|
committer | Tuomas Heimonen <tuomas.heimonen@qt.io> | 2018-09-10 06:57:20 +0000 |
commit | a0d9fb33f8475336fbdebdbab803f43c7b9107d4 (patch) | |
tree | b89aa693d917976736a52dea805e91ad41afd7e2 /meta-boot2qt/classes | |
parent | 8f8722d36a1341c08c86c4357da8f398cc31e771 (diff) | |
download | meta-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/classes')
-rw-r--r-- | meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass index e98565c..ee1a25f 100644 --- a/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass +++ b/meta-boot2qt/classes/populate_b2qt_qt5_sdk.bbclass | |||
@@ -34,6 +34,7 @@ NATIVE_SDK_MKSPEC_DIR = "${SDK_OUTPUT}${SDKPATHNATIVE}${libdir}/${QT_DIR_NAME}/m | |||
34 | SDK_MKSPEC = "devices/linux-oe-generic-g++" | 34 | SDK_MKSPEC = "devices/linux-oe-generic-g++" |
35 | SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri" | 35 | SDK_DEVICE_PRI = "${SDK_MKSPEC_DIR}/qdevice.pri" |
36 | SDK_DYNAMIC_FLAGS = "-O. -pipe -g" | 36 | SDK_DYNAMIC_FLAGS = "-O. -pipe -g" |
37 | MACHINE_CMAKE = "${SDK_OUTPUT}${SDKPATHNATIVE}${datadir}/cmake/OEToolchainConfig.cmake.d/${MACHINE}.cmake" | ||
37 | 38 | ||
38 | create_sdk_files_append () { | 39 | create_sdk_files_append () { |
39 | # Create the toolchain user's generic device mkspec | 40 | # Create the toolchain user's generic device mkspec |
@@ -79,6 +80,16 @@ EOF | |||
79 | 80 | ||
80 | # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it | 81 | # Link /etc/resolv.conf is broken in the toolchain sysroot, remove it |
81 | rm -f ${SDK_OUTPUT}${SDKTARGETSYSROOT}${sysconfdir}/resolv.conf | 82 | rm -f ${SDK_OUTPUT}${SDKTARGETSYSROOT}${sysconfdir}/resolv.conf |
83 | |||
84 | # Create and add cmake toolchain file | ||
85 | echo "set(CMAKE_SYSROOT ${SDKTARGETSYSROOT})" > ${MACHINE_CMAKE} | ||
86 | echo "set(CMAKE_PREFIX_PATH ${SDKTARGETSYSROOT}${OE_QMAKE_PATH_LIBS}/cmake)" >> ${MACHINE_CMAKE} | ||
87 | echo "set(compiler_flags \"${TARGET_CC_ARCH}\")" >> ${MACHINE_CMAKE} | ||
88 | echo "set(CMAKE_C_COMPILER_ARG1 \"\${compiler_flags}\")" >> ${MACHINE_CMAKE} | ||
89 | echo "set(CMAKE_CXX_COMPILER_ARG1 \"\${compiler_flags}\")" >> ${MACHINE_CMAKE} | ||
90 | echo "set(OE_QMAKE_PATH_EXTERNAL_HOST_BINS ${SDKPATHNATIVE}${OE_QMAKE_PATH_HOST_BINS})" >> ${MACHINE_CMAKE} | ||
91 | mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ | ||
92 | install -m 0644 ${MACHINE_CMAKE} ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/ | ||
82 | } | 93 | } |
83 | 94 | ||
84 | create_qtcreator_configure_script () { | 95 | create_qtcreator_configure_script () { |