From 6c8fb8aad89d3dfdf131ad4bf0ed9ef36f7f7cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D0=B8=D1=85=D0=B0=D0=B8=D0=BB=20=D0=A1=D0=B2=D0=B5?= =?UTF-8?q?=D1=82=D0=BA=D0=B8=D0=BD?= Date: Mon, 11 Feb 2019 14:12:07 +0100 Subject: [PATCH] cmake: Fix build widgets on macOS Change-Id: I9c7b7e1677f665861f8a106244468bdc0e1386f2 Reviewed-by: Liang Qi --- src/widgets/CMakeLists.txt | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/widgets/CMakeLists.txt b/src/widgets/CMakeLists.txt index 7e02d7e19b..b3847f430a 100644 --- a/src/widgets/CMakeLists.txt +++ b/src/widgets/CMakeLists.txt @@ -79,13 +79,13 @@ add_dependencies(Widgets Qt::uic) #extend_target(Widgets CONDITION APPLE_OSX #) -extend_target(Widgets CONDITION (APPLE_OSX) AND (macos) +extend_target(Widgets CONDITION APPLE_OSX LIBRARIES ${FWAppKit} z ) -extend_target(Widgets CONDITION ((APPLE_OSX) AND (macos)) AND (*-mwerks) +extend_target(Widgets CONDITION APPLE_OSX AND (*-mwerks) INCLUDE_DIRECTORIES compat ) @@ -114,7 +114,7 @@ extend_target(Widgets CONDITION QT_FEATURE_graphicseffect #extend_target(Widgets CONDITION testcocoon #) -extend_target(Widgets CONDITION macx +extend_target(Widgets CONDITION APPLE_OSX SOURCES kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h ) @@ -377,13 +377,13 @@ extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol widgets/qwidgettextcontrol_p_p.h ) -extend_target(Widgets CONDITION macx +extend_target(Widgets CONDITION APPLE_OSX SOURCES widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm widgets/qmacnativewidget_mac.h widgets/qmacnativewidget_mac.mm ) -extend_target(Widgets CONDITION (macx) AND (QT_FEATURE_menu OR QT_FEATURE_menubar) +extend_target(Widgets CONDITION (APPLE_OSX) AND (QT_FEATURE_menu OR QT_FEATURE_menubar) SOURCES widgets/qmenu_mac.mm )