[oe] [PATCH 2/2] nativesdk-qtbase: Add CMake toolchain configuration
Otavio Salvador
otavio at ossystems.com.br
Tue Oct 21 01:59:50 UTC 2014
This allow out of box use of CMake in a SDK; this includes the
subscript to properly set the host binaries path.
Signed-off-by: Otavio Salvador <otavio at ossystems.com.br>
---
recipes-qt/qt5/nativesdk-qtbase.inc | 11 +++++++++++
recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake | 1 +
recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake | 1 +
3 files changed, 13 insertions(+)
create mode 100644 recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake
create mode 100644 recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake
diff --git a/recipes-qt/qt5/nativesdk-qtbase.inc b/recipes-qt/qt5/nativesdk-qtbase.inc
index 09f3d9a..ea55fa2 100644
--- a/recipes-qt/qt5/nativesdk-qtbase.inc
+++ b/recipes-qt/qt5/nativesdk-qtbase.inc
@@ -35,6 +35,11 @@ SRC_URI += " \
file://0013-configure-preserve-built-qmake-and-swap-with-native-.patch \
"
+# CMake's toolchain configuration of nativesdk-qtbase
+SRC_URI += " \
+ file://OEQt5Toolchain.cmake \
+"
+
PACKAGES = "${PN}-tools-dbg ${PN}-tools-dev ${PN}-tools-staticdev ${PN}-tools"
PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src"
@@ -58,6 +63,7 @@ FILES_${PN}-tools = " \
${libdir}/lib*${SOLIBS} \
${OE_QMAKE_PATH_BINS}/* \
${SDKPATHNATIVE}/environment-setup.d \
+ ${datadir}/cmake \
"
# qttools binaries are placed in a subdir of bin in order to avoid
@@ -218,6 +224,10 @@ do_install() {
-not -name 'libQt5Core.so*' -and \
-not -name 'libQt5Bootstrap.a' \
-exec rm '{}' ';'
+
+ # Install CMake's toolchain configuration
+ mkdir -p ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
+ install -m 644 ${WORKDIR}/OEQt5Toolchain.cmake ${D}${datadir}/cmake/OEToolchainConfig.cmake.d/
}
do_generate_qt_environment_file() {
@@ -241,6 +251,7 @@ do_generate_qt_environment_file() {
echo 'export OE_QMAKE_QDBUSCPP2XML=${OE_QMAKE_PATH_HOST_BINS}/qdbuscpp2xml' >> $script
echo 'export OE_QMAKE_QDBUSXML2CPP=${OE_QMAKE_PATH_HOST_BINS}/qdbusxml2cpp' >> $script
echo 'export OE_QMAKE_QT_CONFIG=`qmake -query QT_INSTALL_LIBS`/${QT_DIR_NAME}/mkspecs/qconfig.pri' >> $script
+ echo 'export OE_QMAKE_PATH_HOST_BINS=${OE_QMAKE_PATH_HOST_BINS}' >> $script
echo 'export QMAKESPEC=`qmake -query QT_INSTALL_LIBS`/mkspecs/linux-oe-g++' >> $script
# Use relocable sysroot
diff --git a/recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake b/recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake
new file mode 100644
index 0000000..6f0042b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase-git/OEQt5Toolchain.cmake
@@ -0,0 +1 @@
+set( OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS} )
diff --git a/recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake b/recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake
new file mode 100644
index 0000000..6f0042b
--- /dev/null
+++ b/recipes-qt/qt5/qtbase/OEQt5Toolchain.cmake
@@ -0,0 +1 @@
+set( OE_QMAKE_PATH_EXTERNAL_HOST_BINS $ENV{OE_QMAKE_PATH_HOST_BINS} )
--
1.7.10.4
More information about the Openembedded-devel
mailing list