diff options
author | Robert Griebl <robert.griebl@qt.io> | 2021-05-03 16:42:46 +0200 |
---|---|---|
committer | Robert Griebl <robert.griebl@qt.io> | 2021-06-18 13:06:27 +0200 |
commit | 26e09279f3cd12324657011c640972e297928f53 (patch) | |
tree | 17839d952b17fcc6338105a85604f543dc95547b /src/dbus-lib | |
parent | 12b4ee7d85b1197cd4b6024e710430a747f76838 (diff) | |
download | qtapplicationmanager-26e09279f3cd12324657011c640972e297928f53.tar.gz |
cmake: Nearly full cmake build
Had to rename a lot of things to conform with the standard Qt module
layout that the cmake system expects:
- all non-manual tests were moved to a sub-dir named auto/
- the benchmark was moved to tests/
- the 3rdparty folder was moved into src/
Other changes:
- libyaml was updated to 2.2.5 while fixing a weird build issue that
led to crashes on 64bit systems.
- fixed build issues with the new 8.1 MingW compiler.
- added support for QT_NO_OPENGL builds.
The remaining issues are:
- examples still don't build with qmake due to a potential bug in
module.pri generation.
- tests do run, but the test data is not generated yet dynamically.
- qml-only tests are not built and run yet.
- qml-only examples are not built yet.
Fixes: AUTOSUITE-1632
Change-Id: Ic5fe0148e738b05835c73bed78e624b55861b75e
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Dominik Holland <dominik.holland@qt.io>
Diffstat (limited to 'src/dbus-lib')
-rw-r--r-- | src/dbus-lib/CMakeLists.txt | 66 |
1 files changed, 66 insertions, 0 deletions
diff --git a/src/dbus-lib/CMakeLists.txt b/src/dbus-lib/CMakeLists.txt new file mode 100644 index 00000000..8c371423 --- /dev/null +++ b/src/dbus-lib/CMakeLists.txt @@ -0,0 +1,66 @@ +# Generated from dbus-lib.pro. + +##################################################################### +## AppManDBus Module: +##################################################################### + +# temporary hack to get around the "#pragma once not allowed in cpp" error +set(QT_FEATURE_headersclean FALSE) + +qt_internal_add_module(AppManDBusPrivate + CONFIG_MODULE_NAME appman_dbus + STATIC + EXCEPTIONS + INTERNAL_MODULE + SOURCES + abstractdbuscontextadaptor.cpp abstractdbuscontextadaptor.h + applicationmanagerdbuscontextadaptor.cpp applicationmanagerdbuscontextadaptor.h + dbusdaemon.cpp dbusdaemon.h + dbuspolicy.cpp dbuspolicy.h + notificationmanagerdbuscontextadaptor.cpp notificationmanagerdbuscontextadaptor.h + windowmanagerdbuscontextadaptor.cpp windowmanagerdbuscontextadaptor.h + LIBRARIES + Qt::AppManCommonPrivate + Qt::AppManManagerPrivate + Qt::AppManWindowPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DBus +) + +#### Keys ignored in scope 1:.:.:dbus-lib.pro:<TRUE>: +# ADAPTORS_XML = "io.qt.applicationmanager.xml" "io.qt.windowmanager.xml" "org.freedesktop.notifications.xml" +# MODULE = "appman_dbus" +# OTHER_FILES = "io.qt.packagemanager.xml" "io.qt.applicationmanager.applicationinterface.xml" "io.qt.applicationmanager.runtimeinterface.xml" "io.qt.applicationmanager.intentinterface.xml" "io.qt.applicationmanager.xml" "io.qt.windowmanager.xml" "org.freedesktop.notifications.xml" +# QMAKE_EXTRA_TARGETS = "recreate-dbus-xml" "recreate-applicationmanager-dbus-xml" "recreate-packagemanager-dbus-xml" "recreate-windowmanager-dbus-xml" +# TEMPLATE = "lib" +# recreate-applicationmanager-dbus-xml.CONFIG = "phony" +# recreate-applicationmanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager-lib/applicationmanager.h" "-o" "$$PWD/io.qt.applicationmanager.xml" +# recreate-dbus-xml.depends = "recreate-applicationmanager-dbus-xml" "recreate-applicationinstaller-dbus-xml" "recreate-windowmanager-dbus-xml" +# recreate-packagemanager-dbus-xml.CONFIG = "phony" +# recreate-packagemanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager-lib/packagemanager.h" "-o" "$$PWD/io.qt.packagemanager.xml" +# recreate-windowmanager-dbus-xml.CONFIG = "phony" +# recreate-windowmanager-dbus-xml.commands = "$$QDBUSCPP2XML" "-a" "$$PWD/../manager/windowmanager.h" "-o" "$$PWD/io.qt.windowmanager.xml" + + +qtam_internal_add_dbus_adaptor(AppManDBusPrivate + DBUS_ADAPTOR_SOURCES + io.qt.applicationmanager.xml + io.qt.windowmanager.xml + org.freedesktop.notifications.xml + DBUS_ADAPTOR_FLAGS + -i dbus-utilities.h +) + +if (QT_FEATURE_installer) + qtam_internal_add_dbus_adaptor(AppManDBusPrivate + DBUS_ADAPTOR_SOURCES + io.qt.packagemanager.xml + DBUS_ADAPTOR_FLAGS + -i dbus-utilities.h + ) + qt_internal_extend_target(AppManDBusPrivate + SOURCES + packagemanagerdbuscontextadaptor.cpp packagemanagerdbuscontextadaptor.h + ) +endif() |