diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-10 18:31:58 +0100 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-02-11 10:19:42 +0100 |
commit | f1ae5ae726cf909e4ee943eae8e09f8aff74bb3e (patch) | |
tree | 0035f377344b27ec20aa3e2d9b64eab4d971a42a /src/plugins/platforms/eglfs/CMakeLists.txt | |
parent | 79da236e76752c1f940036dffffebb8d2a707d66 (diff) | |
parent | 3af9d49bb78ac56bff57d1c3867853730f97a8e1 (diff) |
Merge "Merge remote-tracking branch 'origin/wip/cmake' into dev"
Diffstat (limited to 'src/plugins/platforms/eglfs/CMakeLists.txt')
-rw-r--r-- | src/plugins/platforms/eglfs/CMakeLists.txt | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/src/plugins/platforms/eglfs/CMakeLists.txt b/src/plugins/platforms/eglfs/CMakeLists.txt index 01949586bc..03de79d6f0 100644 --- a/src/plugins/platforms/eglfs/CMakeLists.txt +++ b/src/plugins/platforms/eglfs/CMakeLists.txt @@ -20,7 +20,7 @@ qt_add_module(EglFSDeviceIntegration QT_EGL_NO_X11 INCLUDE_DIRECTORIES api - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate Qt::DeviceDiscoverySupportPrivate Qt::EglSupportPrivate @@ -40,17 +40,21 @@ qt_add_module(EglFSDeviceIntegration ##################################################################### qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::InputSupportPrivate - LIBRARIES - Qt::InputSupportPrivate PUBLIC_LIBRARIES - Qt::InputSupport + Qt::InputSupportPrivate ) qt_extend_target(EglFSDeviceIntegration CONDITION TARGET Qt::PlatformCompositorSupportPrivate - LIBRARIES + PUBLIC_LIBRARIES Qt::PlatformCompositorSupportPrivate +) + +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 PUBLIC_LIBRARIES - Qt::PlatformCompositorSupport + Qt::VulkanSupportPrivate ) # special case: @@ -78,12 +82,12 @@ qt_extend_target(EglFSDeviceIntegration CONDITION QT_FEATURE_opengl api/qeglfscursor.cpp api/qeglfscursor_p.h ) ##################################################################### -## qeglfs Plugin: +## QEglFSIntegrationPlugin Plugin: ##################################################################### -qt_add_plugin(qeglfs +qt_add_plugin(QEglFSIntegrationPlugin + OUTPUT_NAME qeglfs TYPE platforms - CLASS_NAME QEglFSIntegrationPlugin DEFAULT_IF ${QT_QPA_DEFAULT_PLATFORM} MATCHES eglfs # special case SOURCES qeglfsmain.cpp @@ -91,18 +95,18 @@ qt_add_plugin(qeglfs QT_EGL_NO_X11 INCLUDE_DIRECTORIES api - LIBRARIES + PUBLIC_LIBRARIES Qt::CorePrivate # special case Qt::EglFSDeviceIntegrationPrivate EGL::EGL # special case ) -#### Keys ignored in scope 11:.:.:eglfs-plugin.pro:<TRUE>: +#### Keys ignored in scope 13:.:.:eglfs-plugin.pro:<TRUE>: # OTHER_FILES = "$$PWD/eglfs.json" ## Scopes: ##################################################################### -#### Keys ignored in scope 12:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: +#### Keys ignored in scope 14:.:.:eglfs-plugin.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN: # PLUGIN_EXTENDS = "-" add_subdirectory(deviceintegration) |