diff options
| author | Albert Astals Cid <albert.astals.cid@kdab.com> | 2019-01-31 11:43:51 +0100 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@qt.io> | 2019-02-01 12:27:11 +0000 |
| commit | 70419e31f9a8de172459a6e1cce67e816c7ddbed (patch) | |
| tree | dddcc8a7c88398d0c81e4e52f622941ee73a3070 /src | |
| parent | b6306cb06675cdab2c1a6d68dcad5201bae5db87 (diff) | |
cmake: Fix build of xcb platform plugin when vulkan is available
Change-Id: I79760aa0cb08752cfc20aabc1a890f60c91c9dfd
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/platformsupport/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/platformsupport/vkconvenience/CMakeLists.txt | 16 | ||||
| -rw-r--r-- | src/plugins/platforms/xcb/CMakeLists.txt | 2 |
3 files changed, 21 insertions, 1 deletions
diff --git a/src/platformsupport/CMakeLists.txt b/src/platformsupport/CMakeLists.txt index e298eb4bc5..a86b958c10 100644 --- a/src/platformsupport/CMakeLists.txt +++ b/src/platformsupport/CMakeLists.txt @@ -19,6 +19,10 @@ if(QT_FEATURE_accessibility) endif() endif() +if(QT_FEATURE_vulkan) + add_subdirectory(vkconvenience) +endif() + if(APPLE) add_subdirectory(clipboard) add_subdirectory(graphics) diff --git a/src/platformsupport/vkconvenience/CMakeLists.txt b/src/platformsupport/vkconvenience/CMakeLists.txt new file mode 100644 index 0000000000..b9504f2b94 --- /dev/null +++ b/src/platformsupport/vkconvenience/CMakeLists.txt @@ -0,0 +1,16 @@ +# Generated from vkconvenience.pro. + +##################################################################### +## VulkanSupport Module: +##################################################################### + +add_qt_module(VulkanSupport + STATIC + SOURCES + qbasicvulkanplatforminstance.cpp qbasicvulkanplatforminstance_p.h + DEFINES + QT_NO_CAST_FROM_ASCII + LIBRARIES + Qt::CorePrivate + Qt::GuiPrivate +) diff --git a/src/plugins/platforms/xcb/CMakeLists.txt b/src/plugins/platforms/xcb/CMakeLists.txt index d1fff8bf25..5540822875 100644 --- a/src/plugins/platforms/xcb/CMakeLists.txt +++ b/src/plugins/platforms/xcb/CMakeLists.txt @@ -75,7 +75,7 @@ extend_target(XcbQpa CONDITION TARGET Qt::LinuxAccessibilitySupportPrivate extend_target(XcbQpa CONDITION QT_FEATURE_vulkan LIBRARIES - vulkan_supportPrivate + VulkanSupportPrivate ) extend_target(XcbQpa CONDITION QT_FEATURE_draganddrop |