From 77885f8402ad65e00e01c5e15777edcedf9741b2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= <tor.arne.vestbo@qt.io>
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 <alexandru.croitor@qt.io>
---
 src/plugins/platforminputcontexts/CMakeLists.txt  | 2 +-
 src/plugins/platforms/.prev_CMakeLists.txt        | 4 ++--
 src/plugins/platforms/CMakeLists.txt              | 4 ++--
 src/plugins/platforms/ios/.prev_CMakeLists.txt    | 2 +-
 src/plugins/platforms/ios/CMakeLists.txt          | 2 +-
 src/plugins/platforms/ios/optional/CMakeLists.txt | 2 +-
 src/plugins/printsupport/.prev_CMakeLists.txt     | 2 +-
 src/plugins/printsupport/CMakeLists.txt           | 2 +-
 8 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'src/plugins')

diff --git a/src/plugins/platforminputcontexts/CMakeLists.txt b/src/plugins/platforminputcontexts/CMakeLists.txt
index 77dbe2f567..b5150df4f3 100644
--- a/src/plugins/platforminputcontexts/CMakeLists.txt
+++ b/src/plugins/platforminputcontexts/CMakeLists.txt
@@ -3,6 +3,6 @@
 if(QT_FEATURE_xkbcommon)
     add_subdirectory(compose)
 endif()
-if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT APPLE_MACOS)
+if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT MACOS)
     add_subdirectory(ibus)
 endif()
diff --git a/src/plugins/platforms/.prev_CMakeLists.txt b/src/plugins/platforms/.prev_CMakeLists.txt
index ce9c870454..c58fb31aea 100644
--- a/src/plugins/platforms/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/.prev_CMakeLists.txt
@@ -12,10 +12,10 @@ endif()
 if(QT_FEATURE_xcb)
     add_subdirectory(xcb)
 endif()
-if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+if(UIKIT AND NOT WATCHOS)
     add_subdirectory(ios)
 endif()
-if(APPLE_MACOS)
+if(MACOS)
     add_subdirectory(cocoa)
 endif()
 if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT)
diff --git a/src/plugins/platforms/CMakeLists.txt b/src/plugins/platforms/CMakeLists.txt
index c4796fb7e1..442596286a 100644
--- a/src/plugins/platforms/CMakeLists.txt
+++ b/src/plugins/platforms/CMakeLists.txt
@@ -12,10 +12,10 @@ endif()
 if(QT_FEATURE_xcb)
     add_subdirectory(xcb)
 endif()
-if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
+if(UIKIT AND NOT WATCHOS)
     add_subdirectory(ios)
 endif()
-if(APPLE_MACOS)
+if(MACOS)
     add_subdirectory(cocoa)
 endif()
 if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test
diff --git a/src/plugins/platforms/ios/.prev_CMakeLists.txt b/src/plugins/platforms/ios/.prev_CMakeLists.txt
index d7ff160ee0..3a330e2b7b 100644
--- a/src/plugins/platforms/ios/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/ios/.prev_CMakeLists.txt
@@ -49,7 +49,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo
         Qt::PlatformCompositorSupportPrivate
 )
 
-extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
+extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosfiledialog.h qiosfiledialog.mm
diff --git a/src/plugins/platforms/ios/CMakeLists.txt b/src/plugins/platforms/ios/CMakeLists.txt
index d7ff160ee0..3a330e2b7b 100644
--- a/src/plugins/platforms/ios/CMakeLists.txt
+++ b/src/plugins/platforms/ios/CMakeLists.txt
@@ -49,7 +49,7 @@ extend_target(QIOSIntegrationPlugin CONDITION TARGET Qt::PlatformCompositorSuppo
         Qt::PlatformCompositorSupportPrivate
 )
 
-extend_target(QIOSIntegrationPlugin CONDITION NOT APPLE_TVOS
+extend_target(QIOSIntegrationPlugin CONDITION NOT TVOS
     SOURCES
         qiosclipboard.h qiosclipboard.mm
         qiosfiledialog.h qiosfiledialog.mm
diff --git a/src/plugins/platforms/ios/optional/CMakeLists.txt b/src/plugins/platforms/ios/optional/CMakeLists.txt
index 3c84e61f26..6f5d754d4a 100644
--- a/src/plugins/platforms/ios/optional/CMakeLists.txt
+++ b/src/plugins/platforms/ios/optional/CMakeLists.txt
@@ -1,5 +1,5 @@
 # Generated from optional.pro.
 
-if(APPLE_IOS)
+if(IOS)
     add_subdirectory(nsphotolibrarysupport)
 endif()
diff --git a/src/plugins/printsupport/.prev_CMakeLists.txt b/src/plugins/printsupport/.prev_CMakeLists.txt
index 59b1e8b32a..a1f39cb843 100644
--- a/src/plugins/printsupport/.prev_CMakeLists.txt
+++ b/src/plugins/printsupport/.prev_CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from printsupport.pro.
 
-if(APPLE_MACOS)
+if(MACOS)
     add_subdirectory(cocoa)
 endif()
 if(WIN32)
diff --git a/src/plugins/printsupport/CMakeLists.txt b/src/plugins/printsupport/CMakeLists.txt
index ae6dae1998..1e7013bc1c 100644
--- a/src/plugins/printsupport/CMakeLists.txt
+++ b/src/plugins/printsupport/CMakeLists.txt
@@ -1,6 +1,6 @@
 # Generated from printsupport.pro.
 
-if(APPLE_MACOS)
+if(MACOS)
     add_subdirectory(cocoa)
 endif()
 if(WIN32)
-- 
cgit v1.2.3