qt5: Fix cmake config files
* without syncqt cmake config files have empty PRIVATE_INCLUDE_DIRS remove pregenerated header files and create .git dir to let qmake call syncqt and generate headers like when building from git recipes Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
parent
0b4bdeb6c1
commit
b8a236df79
|
@ -10,3 +10,10 @@ OE_QMAKE_PATH_DOCS = "${OE_QMAKE_PATH_QT_DOCS}"
|
||||||
OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
|
OE_QMAKE_PATH_SETTINGS = "${OE_QMAKE_PATH_QT_SETTINGS}"
|
||||||
OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
|
OE_QMAKE_PATH_EXAMPLES = "${OE_QMAKE_PATH_QT_EXAMPLES}"
|
||||||
OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
|
OE_QMAKE_PATH_TESTS = "${OE_QMAKE_PATH_QT_TESTS}"
|
||||||
|
|
||||||
|
# Regenerate header files when they are included in source tarball
|
||||||
|
# Otherwise cmake files don't set PRIVATE_HEADERS correctly
|
||||||
|
do_configure_prepend() {
|
||||||
|
rm -rf ${S}/include
|
||||||
|
mkdir -p ${S}/.git || true
|
||||||
|
}
|
||||||
|
|
|
@ -32,6 +32,14 @@ python __anonymous() {
|
||||||
d.setVar("PACKAGE_ARCH", tarch)
|
d.setVar("PACKAGE_ARCH", tarch)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
# Regenerate header files when they are included in source tarball
|
||||||
|
# Otherwise cmake files don't set PRIVATE_HEADERS correctly
|
||||||
|
do_configure_prepend() {
|
||||||
|
rm -rf ${S}/include
|
||||||
|
mkdir -p ${S}/.git || true
|
||||||
|
}
|
||||||
|
|
||||||
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
|
PACKAGES =. "${PN}-qmlplugins-dbg ${PN}-tools-dbg ${PN}-plugins-dbg ${PN}-qmlplugins ${PN}-tools ${PN}-plugins ${PN}-mkspecs ${PN}-examples-dev ${PN}-examples-staticdev ${PN}-examples-dbg ${PN}-examples "
|
||||||
|
|
||||||
# extra -dbg packages
|
# extra -dbg packages
|
||||||
|
|
|
@ -1,27 +1,6 @@
|
||||||
require qt5-git.inc
|
require qt5-git.inc
|
||||||
require ${PN}.inc
|
require ${PN}.inc
|
||||||
|
|
||||||
# common with target version
|
|
||||||
SRC_URI = "\
|
|
||||||
git://qt.gitorious.org/qt/${QT_MODULE}.git;branch=${QT_MODULE_BRANCH} \
|
|
||||||
file://0001-Add-linux-oe-g-platform.patch \
|
|
||||||
file://0002-qlibraryinfo-allow-to-set-qt.conf-from-the-outside-u.patch \
|
|
||||||
file://0003-Add-external-hostbindir-option.patch \
|
|
||||||
file://0004-qt_functions-temporary-remove-isEmpty-check.patch \
|
|
||||||
file://0005-configureapp-Prefix-default-LIBDIRS-and-INCDIRS-with.patch \
|
|
||||||
file://0006-qt_module-Fix-pkgconfig-replacement.patch \
|
|
||||||
file://0007-qt_module-Fix-paths-in-.prl-files.patch \
|
|
||||||
file://0008-wayland-scanner-disable-silent-rules.patch \
|
|
||||||
file://0009-configure-don-t-export-SYSTEM_VARIABLES-to-.qmake.va.patch \
|
|
||||||
file://0010-configure.prf-Allow-to-add-extra-arguments-to-make.patch \
|
|
||||||
file://0011-configure-make-pulseaudio-a-configurable-option.patch \
|
|
||||||
file://0012-configure-make-alsa-a-configurable-option.patch \
|
|
||||||
file://0013-configure-make-freetype-a-configurable-option.patch \
|
|
||||||
file://0014-Use-OE_QMAKE_PATH_EXTERNAL_HOST_BINS-to-determine-pa.patch \
|
|
||||||
"
|
|
||||||
|
|
||||||
SRC_URI += "file://0015-Always-build-uic.patch"
|
|
||||||
|
|
||||||
do_install_append() {
|
do_install_append() {
|
||||||
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
|
# for modules which are still using syncqt and call qtPrepareTool(QMAKE_SYNCQT, syncqt)
|
||||||
# e.g. qt3d, qtwayland
|
# e.g. qt3d, qtwayland
|
||||||
|
|
Loading…
Reference in New Issue