From 77771116a4d43e4832494785bc0abde8f3d8fd58 Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Fri, 29 May 2020 18:07:31 +0200 Subject: CMake: Regenerate src/plugins Change-Id: Icceceeb42023e7fa5edf320bb21f03d11bd357b7 Reviewed-by: Joerg Bornemann --- src/plugins/platforms/eglfs/.prev_CMakeLists.txt | 27 +++++++---------- src/plugins/platforms/eglfs/CMakeLists.txt | 38 +++++++++++++----------- 2 files changed, 31 insertions(+), 34 deletions(-) (limited to 'src/plugins/platforms/eglfs') diff --git a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt index 896b8cd3e8..6b4582cf25 100644 --- a/src/plugins/platforms/eglfs/.prev_CMakeLists.txt +++ b/src/plugins/platforms/eglfs/.prev_CMakeLists.txt @@ -42,17 +42,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate Qt::InputSupportPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate - PUBLIC_LIBRARIES - Qt::PlatformCompositorSupportPrivate -) - -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl SOURCES - api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h - api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h + api/qeglfscontext.cpp api/qeglfscontext_p.h + api/qeglfscursor.cpp api/qeglfscursor_p.h PUBLIC_LIBRARIES - Qt::VulkanSupportPrivate + Qt::OpenGLPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY @@ -80,18 +75,16 @@ if(QT_FEATURE_cursor) ) endif() -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES - api/qeglfscontext.cpp api/qeglfscontext_p.h - api/qeglfscursor.cpp api/qeglfscursor_p.h - PUBLIC_LIBRARIES - Qt::OpenGLPrivate + api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h + api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h ) ##################################################################### ## QEglFSIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QEglFSIntegrationPlugin +qt_internal_add_plugin(QEglFSIntegrationPlugin OUTPUT_NAME qeglfs TYPE platforms SOURCES @@ -104,12 +97,12 @@ qt_add_plugin(QEglFSIntegrationPlugin Qt::EglFSDeviceIntegrationPrivate ) -#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:: +#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:: # OTHER_FILES = "$$PWD/eglfs.json" ## Scopes: ##################################################################### -#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 622fbe6037..ebed6cd4bd 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -45,21 +45,27 @@ qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl + SOURCES + api/qeglfscontext.cpp api/qeglfscontext_p.h + api/qeglfscursor.cpp api/qeglfscursor_p.h PUBLIC_LIBRARIES Qt::OpenGLPrivate ) -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan - SOURCES - api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h - api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h -) +# special case begin +# comment out +#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY + #DEFINES + #EGLFS_PLATFORM_HOOKS +#) -# special case: -# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_PLATFORM_HOOKS_SOURCES_ISEMPTY ... -# extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY ... +#qt_extend_target(EglFSDeviceIntegration CONDITION NOT EGLFS_DEVICE_INTEGRATION_ISEMPTY + #DEFINES + #EGLFS_PREFERRED_PLUGIN= +#) +# special case end -if(QT_FEATURE_cursor) # special case +if(QT_FEATURE_cursor) # Resources: set(cursor_resource_files "cursor-atlas.png" @@ -74,18 +80,16 @@ if(QT_FEATURE_cursor) # special case ) endif() -qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl +qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_vulkan SOURCES - api/qeglfscontext.cpp api/qeglfscontext_p.h - api/qeglfscursor.cpp api/qeglfscursor_p.h - PUBLIC_LIBRARIES - Qt::OpenGLPrivate + api/vulkan/qeglfsvulkaninstance.cpp api/vulkan/qeglfsvulkaninstance_p.h + api/vulkan/qeglfsvulkanwindow.cpp api/vulkan/qeglfsvulkanwindow_p.h ) ##################################################################### ## QEglFSIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(QEglFSIntegrationPlugin +qt_internal_add_plugin(QEglFSIntegrationPlugin OUTPUT_NAME qeglfs TYPE platforms DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case @@ -101,12 +105,12 @@ qt_add_plugin(QEglFSIntegrationPlugin EGL::EGL # special case ) -#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:: +#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:: # OTHER_FILES = "$$PWD/eglfs.json" ## Scopes: ##################################################################### -#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) -- cgit v1.2.3