From bc9409d85748c7167a9e8e7eec82fa6c9420ea3d Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 5 Jun 2019 13:48:02 +0200 Subject: Re-generate the CMakeLists.txt and add the prev files Change-Id: I93ea196bdd5807bccebf81e72332966288a35a4f Reviewed-by: Alexandru Croitor --- src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 144 +++++++++++++++++++++ src/plugins/platforms/eglfs/CMakeLists.txt | 17 ++- .../deviceintegration/eglfs_emu/CMakeLists.txt | 20 ++- .../deviceintegration/eglfs_kms/CMakeLists.txt | 29 +++-- .../eglfs_kms_egldevice/CMakeLists.txt | 26 ++-- .../eglfs_kms_support/CMakeLists.txt | 18 ++- .../deviceintegration/eglfs_x11/CMakeLists.txt | 25 ++-- 7 files changed, 231 insertions(+), 48 deletions(-) create mode 100644 src/plugins/platforms/eglfs/.prev_CMakeLists.txt (limited to 'src/plugins/platforms/eglfs') diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt new file mode 100644 index 0000000000..4af52dd0fe --- /dev/null +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -0,0 +1,144 @@ +# Generated from eglfs.pro. + +##################################################################### +## EglFSDeviceIntegration Module: +##################################################################### + +add_qt_module(EglFSDeviceIntegration + SOURCES + api/qeglfsdeviceintegration.cpp api/qeglfsdeviceintegration_p.h + api/qeglfsglobal_p.h + api/qeglfshooks.cpp api/qeglfshooks_p.h + api/qeglfsintegration.cpp api/qeglfsintegration_p.h + api/qeglfsoffscreenwindow.cpp api/qeglfsoffscreenwindow_p.h + api/qeglfsscreen.cpp api/qeglfsscreen_p.h + api/qeglfswindow.cpp api/qeglfswindow_p.h + DEFINES + QT_BUILD_EGL_DEVICE_LIB + QT_EGL_NO_X11 + INCLUDE_DIRECTORIES + api + LIBRARIES + Qt::CorePrivate + Qt::DeviceDiscoverySupportPrivate + Qt::EglSupportPrivate + Qt::EventDispatcherSupportPrivate + Qt::FbSupportPrivate + Qt::FontDatabaseSupportPrivate + Qt::GuiPrivate + Qt::ServiceSupportPrivate + Qt::ThemeSupportPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::DeviceDiscoverySupport + Qt::EglSupport + Qt::EventDispatcherSupport + Qt::FbSupport + Qt::FontDatabaseSupport + Qt::Gui + Qt::ServiceSupport + Qt::ThemeSupport +) + +#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:: +# CONFIG = "internal_module" "egl" +# MODULE = "eglfsdeviceintegration" +# _LOADED = "qt_module" + +## Scopes: +##################################################################### + +extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate + LIBRARIES + Qt::InputSupportPrivate + PUBLIC_LIBRARIES + Qt::InputSupport +) + +extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate + LIBRARIES + Qt::PlatformCompositorSupportPrivate + PUBLIC_LIBRARIES + Qt::PlatformCompositorSupport +) + +extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY + DEFINES + EGLFS_PLATFORM_HOOKS +) + +extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY + DEFINES + EGLFS_PREFERRED_PLUGIN= +) + +#### Keys ignored in scope 7:.:.:eglfsdeviceintegration.pro:use_gold_linker: +# CONFIG = "no_linker_version_script" + +# Resources: +add_qt_resource(EglFSDeviceIntegration "cursor" FILES + cursor-atlas.png + cursor.json) + + +extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl + SOURCES + api/qeglfscontext.cpp api/qeglfscontext_p.h + api/qeglfscursor.cpp api/qeglfscursor_p.h +) +##################################################################### +## qeglfs Plugin: +##################################################################### + +add_qt_plugin(qeglfs + TYPE platforms + CLASS_NAME QEglFSIntegrationPlugin + SOURCES + qeglfsmain.cpp + DEFINES + QT_EGL_NO_X11 + INCLUDE_DIRECTORIES + api + LIBRARIES + Qt::EglFSDeviceIntegrationPrivate + PUBLIC_LIBRARIES + Qt::EglFSDeviceIntegration +) + +#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:: +# CONFIG = "egl" +# OTHER_FILES = "$$PWD/eglfs.json" +# PLUGIN_CLASS_NAME = "QEglFSIntegrationPlugin" +# PLUGIN_TYPE = "platforms" +# _LOADED = "qt_plugin" + +## Scopes: +##################################################################### + +#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +# PLUGIN_EXTENDS = "-" +add_subdirectory(deviceintegration) + + if(TARGET Qt::InputSupportPrivate) + endif() + + if(TARGET Qt::PlatformCompositorSupportPrivate) + endif() + + if(NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY) + endif() + + if(NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY) + endif() + + if(use_gold_linker) + endif() + + if(NOT DEFINES___contains___QT_NO_CURSOR) + endif() + + if(QT_FEATURE_opengl) + endif() + + if(NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN) + endif() diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 932d07dec2..47b5f3cf64 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -1,3 +1,4 @@ +# Generated from eglfs.pro. qt_find_package(EGL) # special case ##################################################################### @@ -14,8 +15,8 @@ add_qt_module(EglFSDeviceIntegration api/qeglfsscreen.cpp api/qeglfsscreen_p.h api/qeglfswindow.cpp api/qeglfswindow_p.h DEFINES - QT_EGL_NO_X11 QT_BUILD_EGL_DEVICE_LIB + QT_EGL_NO_X11 INCLUDE_DIRECTORIES api LIBRARIES @@ -31,7 +32,7 @@ add_qt_module(EglFSDeviceIntegration EGL::EGL # special case ) -#### Keys ignored in scope 2:.:./eglfsdeviceintegration.pro:: +#### Keys ignored in scope 2:.:.:eglfsdeviceintegration.pro:: # CONFIG = "internal_module" "egl" # MODULE = "eglfsdeviceintegration" # _LOADED = "qt_module" @@ -42,18 +43,22 @@ add_qt_module(EglFSDeviceIntegration extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate LIBRARIES Qt::InputSupportPrivate + PUBLIC_LIBRARIES + Qt::InputSupport ) extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate LIBRARIES Qt::PlatformCompositorSupportPrivate + PUBLIC_LIBRARIES + Qt::PlatformCompositorSupport ) # special case: # extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ... # extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ... -#### Keys ignored in scope 7:.:./eglfsdeviceintegration.pro:use_gold_linker: +#### Keys ignored in scope 7:.:.:eglfsdeviceintegration.pro:use_gold_linker: # CONFIG = "no_linker_version_script" # Resources: @@ -73,6 +78,7 @@ extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl add_qt_plugin(qeglfs TYPE platforms + CLASS_NAME QEglFSIntegrationPlugin SOURCES qeglfsmain.cpp DEFINES @@ -85,16 +91,17 @@ add_qt_plugin(qeglfs EGL::EGL # special case ) -#### Keys ignored in scope 11:.:./eglfs-plugin.pro:: +#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:: # CONFIG = "egl" # OTHER_FILES = "$$PWD/eglfs.json" # PLUGIN_CLASS_NAME = "QEglFSIntegrationPlugin" +# PLUGIN_TYPE = "platforms" # _LOADED = "qt_plugin" ## Scopes: ##################################################################### -#### Keys ignored in scope 12:.:./eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt index 64dd4d8548..a9ab601dad 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_emu/CMakeLists.txt @@ -6,6 +6,7 @@ add_qt_plugin(qeglfs-emu-integration TYPE egldeviceintegrations + CLASS_NAME QEglFSEmulatorIntegrationPlugin SOURCES qeglfsemulatorintegration.cpp qeglfsemulatorintegration.h qeglfsemulatorscreen.cpp qeglfsemulatorscreen.h @@ -16,11 +17,18 @@ add_qt_plugin(qeglfs-emu-integration ../../api LIBRARIES Qt::CorePrivate - Qt::GuiPrivate Qt::EglFSDeviceIntegrationPrivate - # CONFIG = "egl" - # DISTFILES = "eglfs_emu.json" - # OTHER_FILES = "$$PWD/eglfs_emu.json" - # PLUGIN_CLASS_NAME = "QEglFSEmulatorIntegrationPlugin" - # _LOADED = "qt_plugin" + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::EglFSDeviceIntegration + Qt::Gui ) + +#### Keys ignored in scope 1:.:.:eglfs_emu.pro:: +# CONFIG = "egl" +# DISTFILES = "eglfs_emu.json" +# OTHER_FILES = "$$PWD/eglfs_emu.json" +# PLUGIN_CLASS_NAME = "QEglFSEmulatorIntegrationPlugin" +# PLUGIN_TYPE = "egldeviceintegrations" +# _LOADED = "qt_plugin" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt index 214b13be2e..579220dd47 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms/CMakeLists.txt @@ -1,14 +1,12 @@ # Generated from eglfs_kms.pro. -qt_find_package(gbm) -qt_find_package(Libdrm) - ##################################################################### ## qeglfs-kms-integration Plugin: ##################################################################### add_qt_plugin(qeglfs-kms-integration TYPE egldeviceintegrations + CLASS_NAME QEglFSKmsGbmIntegrationPlugin SOURCES qeglfskmsgbmcursor.cpp qeglfskmsgbmcursor.h qeglfskmsgbmdevice.cpp qeglfskmsgbmdevice.h @@ -23,16 +21,25 @@ add_qt_plugin(qeglfs-kms-integration ../eglfs_kms_support LIBRARIES Qt::CorePrivate - Qt::GuiPrivate + Qt::EdidSupportPrivate Qt::EglFSDeviceIntegrationPrivate Qt::EglFsKmsSupportPrivate + Qt::GuiPrivate Qt::KmsSupportPrivate - Qt::EdidSupportPrivate - Qt::PlatformCompositorSupportPrivate - gbm::gbm + PUBLIC_LIBRARIES Libdrm::Libdrm - # CONFIG = "egl" - # OTHER_FILES = "$$PWD/eglfs_kms.json" - # PLUGIN_CLASS_NAME = "QEglFSKmsGbmIntegrationPlugin" - # _LOADED = "qt_plugin" + Qt::Core + Qt::EdidSupport + Qt::EglFSDeviceIntegration + Qt::EglFsKmsSupport + Qt::Gui + Qt::KmsSupport + gbm::gbm ) + +#### Keys ignored in scope 1:.:.:eglfs_kms.pro:: +# CONFIG = "egl" +# OTHER_FILES = "$$PWD/eglfs_kms.json" +# PLUGIN_CLASS_NAME = "QEglFSKmsGbmIntegrationPlugin" +# PLUGIN_TYPE = "egldeviceintegrations" +# _LOADED = "qt_plugin" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt index 526c75a882..cdaca72ac4 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_egldevice/CMakeLists.txt @@ -1,13 +1,12 @@ # Generated from eglfs_kms_egldevice.pro. -qt_find_package(Libdrm) - ##################################################################### ## qeglfs-kms-egldevice-integration Plugin: ##################################################################### add_qt_plugin(qeglfs-kms-egldevice-integration TYPE egldeviceintegrations + CLASS_NAME QEglFSKmsEglDeviceIntegrationPlugin SOURCES qeglfskmsegldevice.cpp qeglfskmsegldevice.h qeglfskmsegldeviceintegration.cpp qeglfskmsegldeviceintegration.h @@ -20,15 +19,24 @@ add_qt_plugin(qeglfs-kms-egldevice-integration ../eglfs_kms_support LIBRARIES Qt::CorePrivate - Qt::GuiPrivate + Qt::EdidSupportPrivate Qt::EglFSDeviceIntegrationPrivate Qt::EglFsKmsSupportPrivate + Qt::GuiPrivate Qt::KmsSupportPrivate - Qt::EdidSupportPrivate - Qt::PlatformCompositorSupportPrivate + PUBLIC_LIBRARIES Libdrm::Libdrm - # CONFIG = "egl" - # OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" - # PLUGIN_CLASS_NAME = "QEglFSKmsEglDeviceIntegrationPlugin" - # _LOADED = "qt_plugin" + Qt::Core + Qt::EdidSupport + Qt::EglFSDeviceIntegration + Qt::EglFsKmsSupport + Qt::Gui + Qt::KmsSupport ) + +#### Keys ignored in scope 1:.:.:eglfs_kms_egldevice.pro:: +# CONFIG = "egl" +# OTHER_FILES = "$$PWD/eglfs_kms_egldevice.json" +# PLUGIN_CLASS_NAME = "QEglFSKmsEglDeviceIntegrationPlugin" +# PLUGIN_TYPE = "egldeviceintegrations" +# _LOADED = "qt_plugin" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt index 96cabe9f1e..fd7ba3cefb 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_kms_support/CMakeLists.txt @@ -1,7 +1,5 @@ # Generated from eglfs_kms_support.pro. -qt_find_package(Libdrm) - ##################################################################### ## EglFsKmsSupport Module: ##################################################################### @@ -19,11 +17,19 @@ add_qt_module(EglFsKmsSupport ../../api LIBRARIES Qt::CorePrivate - Qt::GuiPrivate + Qt::EdidSupportPrivate Qt::EglFSDeviceIntegrationPrivate + Qt::GuiPrivate Qt::KmsSupportPrivate - Qt::EdidSupportPrivate + PUBLIC_LIBRARIES Libdrm::Libdrm - # CONFIG = "no_module_headers" "internal_module" "egl" - # _LOADED = "qt_module" + Qt::Core + Qt::EdidSupport + Qt::EglFSDeviceIntegration + Qt::Gui + Qt::KmsSupport ) + +#### Keys ignored in scope 1:.:.:eglfs_kms_support.pro:: +# CONFIG = "no_module_headers" "internal_module" "egl" +# _LOADED = "qt_module" diff --git a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt index f4487a7747..14a7d59227 100644 --- a/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/deviceintegration/eglfs_x11/CMakeLists.txt @@ -1,15 +1,12 @@ # Generated from eglfs_x11.pro. -qt_find_package(XCB) -qt_find_package(X11) -qt_find_package(X11_XCB) - ##################################################################### ## qeglfs-x11-integration Plugin: ##################################################################### add_qt_plugin(qeglfs-x11-integration TYPE egldeviceintegrations + CLASS_NAME QEglFSX11IntegrationPlugin SOURCES qeglfsx11integration.cpp qeglfsx11integration.h qeglfsx11main.cpp @@ -19,13 +16,19 @@ add_qt_plugin(qeglfs-x11-integration ../../api LIBRARIES Qt::CorePrivate - Qt::GuiPrivate Qt::EglFSDeviceIntegrationPrivate - XCB::XCB - X11::X11 + Qt::GuiPrivate + PUBLIC_LIBRARIES + Qt::Core + Qt::EglFSDeviceIntegration + Qt::Gui X11::XCB - # CONFIG = "egl" - # OTHER_FILES = "$$PWD/eglfs_x11.json" - # PLUGIN_CLASS_NAME = "QEglFSX11IntegrationPlugin" - # _LOADED = "qt_plugin" + XCB::XCB ) + +#### Keys ignored in scope 1:.:.:eglfs_x11.pro:: +# CONFIG = "egl" +# OTHER_FILES = "$$PWD/eglfs_x11.json" +# PLUGIN_CLASS_NAME = "QEglFSX11IntegrationPlugin" +# PLUGIN_TYPE = "egldeviceintegrations" +# _LOADED = "qt_plugin" -- cgit v1.2.3