From 77885f8402ad65e00e01c5e15777edcedf9741b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Mon, 16 Mar 2020 13:36:47 +0100 Subject: cmake: Remove APPLE prefix from platform names None of the other platforms have it. Change-Id: Ib448c2c03ba03f711b507ef391977c0e6aa7c192 Reviewed-by: Alexandru Croitor --- src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt | 4 ++-- src/3rdparty/harfbuzz-ng/CMakeLists.txt | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src/3rdparty/harfbuzz-ng') diff --git a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt index 9da792e15a..1cdc8bafc0 100644 --- a/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/.prev_CMakeLists.txt @@ -158,13 +158,13 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS___contains___opentype HAVE_OT ) -qt_extend_target(BundledHarfbuzz CONDITION APPLE_UIKIT +qt_extend_target(BundledHarfbuzz CONDITION UIKIT LIBRARIES ${FWCoreGraphics} ${FWCoreText} ) -qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT APPLE_UIKIT +qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT LIBRARIES ${FWApplicationServices} ) diff --git a/src/3rdparty/harfbuzz-ng/CMakeLists.txt b/src/3rdparty/harfbuzz-ng/CMakeLists.txt index 8abff4d076..07e0fdf836 100644 --- a/src/3rdparty/harfbuzz-ng/CMakeLists.txt +++ b/src/3rdparty/harfbuzz-ng/CMakeLists.txt @@ -159,13 +159,13 @@ qt_extend_target(BundledHarfbuzz CONDITION TRUE # special case HAVE_OT ) -qt_extend_target(BundledHarfbuzz CONDITION APPLE_UIKIT +qt_extend_target(BundledHarfbuzz CONDITION UIKIT LIBRARIES ${FWCoreGraphics} ${FWCoreText} ) -qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT APPLE_UIKIT +qt_extend_target(BundledHarfbuzz CONDITION APPLE AND NOT UIKIT LIBRARIES ${FWApplicationServices} ) @@ -175,4 +175,4 @@ qt_extend_target(BundledHarfbuzz CONDITION SHAPERS_ISEMPTY OR SHAPERS___contains src/hb-fallback-shape.cc DEFINES HAVE_FALLBACK -) \ No newline at end of file +) -- cgit v1.2.3