From 2216f10ffdd7e6e836dd0b63f5130bcac2f071d7 Mon Sep 17 00:00:00 2001 From: Oliver Wolff Date: Wed, 27 May 2020 11:36:12 +0200 Subject: [PATCH] Update src/gui/CMakeLists.txt The result of running pro2cmake.py Change-Id: Iaaf959069db527c43c8bcdc2cf51e2813bf8d140 Reviewed-by: Alexandru Croitor --- src/gui/CMakeLists.txt | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 32ef40257f..febabb7d4c 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -374,13 +374,12 @@ qt_extend_target(Gui CONDITION APPLE SOURCES image/qimage_darwin.mm painting/qcoregraphics.mm painting/qcoregraphics_p.h + painting/qrasterbackingstore.cpp painting/qrasterbackingstore_p.h + platform/darwin/qmacmime.mm platform/darwin/qmacmime_p.h LIBRARIES ${FWCoreGraphics} -) - -qt_extend_target(Gui CONDITION APPLE - SOURCES - painting/qrasterbackingstore.cpp painting/qrasterbackingstore_p.h + PUBLIC_LIBRARIES + ${FWImageIO} ) qt_extend_target(Gui CONDITION QT_FEATURE_animation @@ -735,11 +734,11 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan SOURCES rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan_p_p.h + vulkan/qbasicvulkanplatforminstance.cpp vulkan/qbasicvulkanplatforminstance_p.h vulkan/qplatformvulkaninstance.cpp vulkan/qplatformvulkaninstance.h vulkan/qvulkanfunctions.cpp vulkan/qvulkaninstance.cpp vulkan/qvulkaninstance.h vulkan/qvulkanwindow.cpp vulkan/qvulkanwindow.h vulkan/qvulkanwindow_p.h - vulkan/qbasicvulkanplatforminstance.cpp vulkan/qbasicvulkanplatforminstance_p.h PUBLIC_LIBRARIES Vulkan::Vulkan_nolink ) @@ -810,14 +809,6 @@ qt_extend_target(Gui CONDITION WASM platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h ) -qt_extend_target(Gui CONDITION IOS OR MACOS - SOURCES - platform/darwin/qmacmime.mm - platform/darwin/qmacmime_p.h - PUBLIC_LIBRARIES - ${FWImageIO} -) - qt_extend_target(Gui CONDITION IOS OR MACOS SOURCES rhi/qrhimetal.mm rhi/qrhimetal_p.h