diff options
Diffstat (limited to 'src/compositor/CMakeLists.txt')
| -rw-r--r-- | src/compositor/CMakeLists.txt | 90 |
1 files changed, 50 insertions, 40 deletions
diff --git a/src/compositor/CMakeLists.txt b/src/compositor/CMakeLists.txt index bb8879422..19bdc7d3a 100644 --- a/src/compositor/CMakeLists.txt +++ b/src/compositor/CMakeLists.txt @@ -1,20 +1,16 @@ +# Copyright (C) 2022 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + # Generated from compositor.pro. ##################################################################### ## WaylandCompositor Module: ##################################################################### -# special case begin -set(__qt_wayland_compositor_module_args "") -if(QT_FEATURE_wayland_compositor_quick) - list(APPEND __qt_wayland_compositor_module_args "GENERATE_METATYPES") -endif() -# special case end - qt_internal_add_module(WaylandCompositor - ${__qt_wayland_compositor_module_args} # special case PLUGIN_TYPES wayland-graphics-integration-server wayland-hardware-layer-integration SOURCES + compat/removed_api.cpp ../shared/qwaylandinputmethodeventbuilder.cpp ../shared/qwaylandinputmethodeventbuilder_p.h ../shared/qwaylandmimehelper.cpp ../shared/qwaylandmimehelper_p.h ../shared/qwaylandsharedmemoryformathelper_p.h @@ -40,20 +36,22 @@ qt_internal_add_module(WaylandCompositor extensions/qwaylandqttextinputmethodmanager.cpp extensions/qwaylandqttextinputmethodmanager.h extensions/qwaylandqttextinputmethodmanager_p.h extensions/qwaylandqtwindowmanager.cpp extensions/qwaylandqtwindowmanager.h extensions/qwaylandqtwindowmanager_p.h extensions/qwaylandshell.cpp extensions/qwaylandshell.h extensions/qwaylandshell_p.h - extensions/qwaylandshellsurface.cpp extensions/qwaylandshellsurface.h + extensions/qwaylandshellsurface.cpp extensions/qwaylandshellsurface.h extensions/qwaylandshellsurface_p.h extensions/qwaylandtextinput.cpp extensions/qwaylandtextinput.h extensions/qwaylandtextinput_p.h extensions/qwaylandtextinputmanager.cpp extensions/qwaylandtextinputmanager.h extensions/qwaylandtextinputmanager_p.h + extensions/qwaylandtextinputv3.cpp extensions/qwaylandtextinputv3.h extensions/qwaylandtextinputv3_p.h + extensions/qwaylandtextinputmanagerv3.cpp extensions/qwaylandtextinputmanagerv3.h extensions/qwaylandtextinputmanagerv3_p.h extensions/qwaylandviewporter.cpp extensions/qwaylandviewporter.h extensions/qwaylandviewporter_p.h extensions/qwaylandwlshell.cpp extensions/qwaylandwlshell.h extensions/qwaylandwlshell_p.h extensions/qwaylandxdgdecorationv1.cpp extensions/qwaylandxdgdecorationv1.h extensions/qwaylandxdgdecorationv1_p.h extensions/qwaylandxdgoutputv1.cpp extensions/qwaylandxdgoutputv1.h extensions/qwaylandxdgoutputv1_p.h extensions/qwaylandxdgshell.cpp extensions/qwaylandxdgshell.h extensions/qwaylandxdgshell_p.h + extensions/qwaylandxdgdialogv1.cpp extensions/qwaylandxdgdialogv1_p.h extensions/qwlqtkey.cpp extensions/qwlqtkey_p.h extensions/qwlqttouch.cpp extensions/qwlqttouch_p.h - global/qtwaylandcompositorglobal.h + global/qtwaylandcompositorglobal.h global/qtwaylandcompositorglobal_p.h global/qtwaylandqmlinclude.h global/qwaylandcompositorextension.cpp global/qwaylandcompositorextension.h global/qwaylandcompositorextension_p.h - global/qwaylandquickextension.h global/qwaylandutils_p.h hardware_integration/qwlclientbufferintegration.cpp hardware_integration/qwlclientbufferintegration_p.h wayland_wrapper/qwlbuffermanager.cpp wayland_wrapper/qwlbuffermanager_p.h @@ -65,9 +63,11 @@ qt_internal_add_module(WaylandCompositor extensions global wayland_wrapper + GENERATE_CPP_EXPORTS LIBRARIES Qt::CorePrivate Qt::GuiPrivate + Qt::WaylandGlobalPrivate PUBLIC_LIBRARIES Qt::Core Qt::Gui @@ -75,8 +75,25 @@ qt_internal_add_module(WaylandCompositor PRIVATE_MODULE_INTERFACE Qt::CorePrivate Qt::GuiPrivate + Qt::WaylandGlobalPrivate + PRIVATE_HEADER_FILTERS + "^qwayland-.*\.h|^wayland-.*-protocol\.h" +) + +# all those macros define structs with Q_OBJECT macros, and should be picked up by moc +set_target_properties(WaylandCompositor WaylandCompositorPrivate + PROPERTIES + INTERFACE_AUTOMOC_MACRO_NAMES "Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_NAMED_ELEMENT;Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_NAMED_CLASS;Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CLASS;Q_COMPOSITOR_DECLARE_QUICK_EXTENSION_CONTAINER_CLASS" +) + +set(compositor_no_pch_sources + compat/removed_api.cpp ) +foreach(src ${compositor_no_pch_sources}) + qt_update_ignore_pch_source(WaylandCompositor ${src}) +endforeach() + # Resources: set(compositor_resource_files "shaders/surface.vert.qsb" @@ -85,6 +102,7 @@ set(compositor_resource_files "shaders/surface_y_u_v.frag.qsb" "shaders/surface_y_uv.frag.qsb" "shaders/surface_y_xuxv.frag.qsb" + "shaders/surface_oes_external.frag" ) qt_internal_add_resource(WaylandCompositor "compositor" @@ -94,18 +112,20 @@ qt_internal_add_resource(WaylandCompositor "compositor" ${compositor_resource_files} ) - qt6_generate_wayland_protocol_server_sources(WaylandCompositor FILES ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/idle-inhibit-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/ivi-application.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/presentation-time.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/scaler.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v2.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/text-input-unstable-v3.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/viewporter.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/wayland.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-decoration-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-output-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-shell.xml + ${CMAKE_CURRENT_SOURCE_DIR}/../3rdparty/protocol/xdg-dialog-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/hardware-integration.xml ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-key-unstable-v1.xml ${CMAKE_CURRENT_SOURCE_DIR}/../extensions/qt-text-input-method-unstable-v1.xml @@ -132,6 +152,7 @@ qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_opengl hardware_integration/qwlserverbufferintegration.cpp hardware_integration/qwlserverbufferintegration_p.h hardware_integration/qwlserverbufferintegrationfactory.cpp hardware_integration/qwlserverbufferintegrationfactory_p.h hardware_integration/qwlserverbufferintegrationplugin.cpp hardware_integration/qwlserverbufferintegrationplugin_p.h + hardware_integration/qwltextureorphanage.cpp hardware_integration/qwltextureorphanage_p.h PUBLIC_LIBRARIES Qt::OpenGL ) @@ -143,19 +164,21 @@ qt_internal_extend_target(WaylandCompositor CONDITION TARGET Qt::Quick qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_compositor_quick SOURCES - compositor_api/qwaylandcompositorquickextensions_p.h + compositor_api/qwaylandcompositorquickextensions.cpp compositor_api/qwaylandcompositorquickextensions_p.h compositor_api/qwaylandmousetracker.cpp compositor_api/qwaylandmousetracker_p.h compositor_api/qwaylandquickchildren.h compositor_api/qwaylandquickcompositor.cpp compositor_api/qwaylandquickcompositor.h compositor_api/qwaylandquickitem.cpp compositor_api/qwaylandquickitem.h compositor_api/qwaylandquickitem_p.h compositor_api/qwaylandquickoutput.cpp compositor_api/qwaylandquickoutput.h - compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h + compositor_api/qwaylandquicksurface.cpp compositor_api/qwaylandquicksurface.h compositor_api/qwaylandquicksurface_p.h extensions/qwaylandivisurfaceintegration.cpp extensions/qwaylandivisurfaceintegration_p.h extensions/qwaylandquickshellintegration.cpp extensions/qwaylandquickshellintegration.h extensions/qwaylandquickshellsurfaceitem.cpp extensions/qwaylandquickshellsurfaceitem.h extensions/qwaylandquickshellsurfaceitem_p.h extensions/qwaylandquickxdgoutputv1.cpp extensions/qwaylandquickxdgoutputv1.h extensions/qwaylandwlshellintegration.cpp extensions/qwaylandwlshellintegration_p.h extensions/qwaylandxdgshellintegration.cpp extensions/qwaylandxdgshellintegration_p.h + extensions/qwaylandpresentationtime.cpp extensions/qwaylandpresentationtime_p.h extensions/qwaylandpresentationtime_p_p.h + global/qwaylandquickextension.cpp global/qwaylandquickextension.h LIBRARIES Qt::QmlPrivate Qt::QuickPrivate @@ -167,11 +190,6 @@ qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_composi Qt::QuickPrivate ) -#### Keys ignored in scope 4:.:.:compositor.pro:QT_FEATURE_wayland_compositor_quick: -# QMLTYPES_FILENAME = "plugins.qmltypes" -# QMLTYPES_INSTALL_DIR = "$$[QT_INSTALL_QML]/QtWayland/Compositor" -# QML_IMPORT_NAME = "QtWayland.Compositor" -# QML_IMPORT_VERSION = "$$QT_VERSION" qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadevice SOURCES @@ -181,16 +199,6 @@ qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_wayland_datadev wayland_wrapper/qwldatasource.cpp wayland_wrapper/qwldatasource_p.h ) -# special case begin -# -# Do not explicitly add XKB::XKB. This is already done by Qt::GuiPrivate. -# -#qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_xkbcommon -# PUBLIC_LIBRARIES -# XKB::XKB -#) -# special case end - qt_internal_extend_target(WaylandCompositor CONDITION QT_FEATURE_im SOURCES compositor_api/qwaylandinputmethodcontrol.cpp compositor_api/qwaylandinputmethodcontrol.h compositor_api/qwaylandinputmethodcontrol_p.h @@ -210,19 +218,21 @@ qt_internal_add_docs(WaylandCompositor doc/qtwaylandcompositor.qdocconf ) -# special case begin if (TARGET Qt::Qml) - set_target_properties(WaylandCompositor PROPERTIES - QT_QML_MODULE_INSTALL_QMLTYPES TRUE - QT_QML_MODULE_VERSION ${CMAKE_PROJECT_VERSION} - QT_QML_MODULE_URI QtWayland.Compositor - QT_QMLTYPES_FILENAME plugins.qmltypes - QT_QML_MODULE_INSTALL_DIR "${INSTALL_QMLDIR}/QtWayland/Compositor" + qt_internal_add_qml_module(WaylandCompositor + URI QtWayland.Compositor + VERSION ${PROJECT_VERSION} + CLASS_NAME QWaylandCompositorPlugin + PLUGIN_TARGET qwaylandcompositorplugin + PAST_MAJOR_VERSIONS 1 + QML_FILES + qmlfiles/WaylandCursorItem.qml + qmlfiles/WaylandOutputWindow.qml + DEPENDENCIES + QtQuick + NO_GENERATE_CPP_EXPORTS ) - - qt6_qml_type_registration(WaylandCompositor) endif() qt_record_extra_qt_main_tools_package_dependency(WaylandCompositor WaylandScannerTools "${PROJECT_VERSION}") -# special case end - +qt_record_extra_qt_package_dependency(WaylandCompositor WaylandGlobalPrivate "${PROJECT_VERSION}") |