From 1aff970c49713eb13bc3b8ace8dbdc4cb4a2f379 Mon Sep 17 00:00:00 2001 From: Tobias Hunger Date: Fri, 29 Mar 2019 12:00:31 +0100 Subject: [PATCH] CMake: Re-generate platformsupport/clipboard Change-Id: If05ae02f363a4a9ef6193f7f8822dcbbc58e1738 Reviewed-by: Albert Astals Cid Reviewed-by: Alexandru Croitor --- src/CMakeLists.txt | 1 + src/platformsupport/clipboard/CMakeLists.txt | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 8bde1f760b..030ff2fe02 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -6,6 +6,7 @@ if(APPLE) find_library(FWDiskArbitration DiskArbitration) find_library(FWFoundation Foundation) find_library(FWIOKit IOKit) + find_library(FWImageIO ImageIO) find_library(FWMobileCoreServices MobileCoreServices) find_library(FWSecurity Security) find_library(FWSystemConfiguration SystemConfiguration) diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt index 5c960c1477..97ffe79043 100644 --- a/src/platformsupport/clipboard/CMakeLists.txt +++ b/src/platformsupport/clipboard/CMakeLists.txt @@ -1,13 +1,9 @@ # Generated from clipboard.pro. ##################################################################### -## QtClipboardSupport Module: +## ClipboardSupport Module: ##################################################################### -find_library(FWAppKit AppKit) -find_library(FWImageIO ImageIO) -find_library(FWCoreFoundation CoreFoundation) - add_qt_module(ClipboardSupport STATIC SOURCES @@ -15,13 +11,20 @@ add_qt_module(ClipboardSupport DEFINES QT_NO_CAST_FROM_ASCII LIBRARIES + ${FWImageIO} Qt::CorePrivate Qt::Gui ) +#### Keys ignored in scope 1:.:clipboard.pro:: +# CONFIG = "static" "internal_module" +# MODULE = "clipboard_support" +# _LOADED = "qt_module" + ## Scopes: ##################################################################### -extend_target(ClipboardSupport CONDITION APPLE - LIBRARIES ${FWAppKit} ${FWImageIO} ${FWCoreFoundation} +extend_target(ClipboardSupport CONDITION APPLE_OSX + LIBRARIES + ${FWAppKit} )