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>

8 files changed, 19 insertions, 19 deletions

diff --git a/cmake/FindGLESv2.cmake b/cmake/FindGLESv2.cmake
index 49e757ef55..3ba7b85d68 100644
--- a/cmake/FindGLESv2.cmake
+++ b/cmake/FindGLESv2.cmake
@@ -54,9 +54,9 @@ find_package_handle_standard_args(GLESv2 DEFAULT_MSG ${package_args})
 mark_as_advanced(${package_args})
 
 if(GLESv2_FOUND AND NOT TARGET GLESv2::GLESv2)
-    if(EMSCRIPTEN OR APPLE_UIKIT)
+    if(EMSCRIPTEN OR UIKIT)
         add_library(GLESv2::GLESv2 INTERFACE IMPORTED)
-        if(APPLE_UIKIT)
+        if(UIKIT)
             # For simulator_and_device builds we can't specify the full library path, because
             # it's specific to either the device or the simulator. Resort to passing a link
             # flag instead.
diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
index bb937dac05..5b2dd5bfda 100644
--- a/cmake/QtBaseGlobalTargets.cmake
+++ b/cmake/QtBaseGlobalTargets.cmake
@@ -95,7 +95,7 @@ list(APPEND init_platform "set(CMAKE_C_COMPILER \"${CMAKE_C_COMPILER}\" CACHE ST
 if(APPLE)
     # For simulator_and_device build, we should not explicitly set the sysroot.
     list(LENGTH CMAKE_OSX_ARCHITECTURES _qt_osx_architectures_count)
-    if(CMAKE_OSX_SYSROOT AND NOT _qt_osx_architectures_count GREATER 1 AND APPLE_UIKIT)
+    if(CMAKE_OSX_SYSROOT AND NOT _qt_osx_architectures_count GREATER 1 AND UIKIT)
         list(APPEND init_platform "set(CMAKE_OSX_SYSROOT \"${CMAKE_OSX_SYSROOT}\" CACHE PATH \"\")")
     endif()
     unset(_qt_osx_architectures_count)
@@ -105,7 +105,7 @@ if(APPLE)
             "set(CMAKE_OSX_DEPLOYMENT_TARGET \"${CMAKE_OSX_DEPLOYMENT_TARGET}\" CACHE STRING \"\")")
     endif()
 
-    if(APPLE_UIKIT)
+    if(UIKIT)
         list(APPEND init_platform
             "set(CMAKE_SYSTEM_NAME \"${CMAKE_SYSTEM_NAME}\" CACHE STRING \"\")")
         set(_qt_osx_architectures_escaped "${CMAKE_OSX_ARCHITECTURES}")
@@ -177,7 +177,7 @@ include("${CMAKE_CURRENT_SOURCE_DIR}/configure.cmake")
 
 # Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for
 # simulator_and_device_builds.
-if(APPLE_UIKIT AND NOT QT_UIKIT_SDK)
+if(UIKIT AND NOT QT_UIKIT_SDK)
     set(__QtFeature_custom_enabled_cache_variables
         TEST_subarch_sse2
         FEATURE_sse2
@@ -267,7 +267,7 @@ qt_copy_or_install(DIRECTORY cmake/
     PATTERN "3rdparty" EXCLUDE
 )
 
-if(APPLE_MACOS)
+if(MACOS)
     qt_copy_or_install(FILES
         cmake/macos/MacOSXBundleInfo.plist.in
         DESTINATION "${__GlobalConfig_install_dir}/macos"
diff --git a/cmake/QtCompilerOptimization.cmake b/cmake/QtCompilerOptimization.cmake
index 1f50044a6f..42206368d9 100644
--- a/cmake/QtCompilerOptimization.cmake
+++ b/cmake/QtCompilerOptimization.cmake
@@ -62,7 +62,7 @@ if(GCC OR CLANG)
     set(QT_CFLAGS_AVX512VBMI "-mavx512vbmi")
     set(QT_CFLAGS_AESNI      "-maes")
     set(QT_CFLAGS_SHANI      "-msha")
-    if(NOT APPLE_UIKIT AND NOT QT_64BIT)
+    if(NOT UIKIT AND NOT QT_64BIT)
         set(QT_CFLAGS_NEON   "-mfpu=neon")
     endif()
     set(QT_CFLAGS_MIPS_DSP   "-mdsp")
diff --git a/cmake/QtConfig.cmake.in b/cmake/QtConfig.cmake.in
index 1d45952502..b63dca8732 100644
--- a/cmake/QtConfig.cmake.in
+++ b/cmake/QtConfig.cmake.in
@@ -34,7 +34,7 @@ list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}")
 list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/extra-cmake-modules/find-modules")
 list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/kwin")
 
-if(APPLE_MACOS)
+if(MACOS)
     # Add module directory to pick up custom Info.plist template
     list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/macos")
 endif()
diff --git a/cmake/QtFeature.cmake b/cmake/QtFeature.cmake
index 34ae83b55d..c48e13833e 100644
--- a/cmake/QtFeature.cmake
+++ b/cmake/QtFeature.cmake
@@ -722,7 +722,7 @@ function(qt_get_platform_try_compile_vars out_var)
     endforeach()
 
     # Pass darwin specific options.
-    if(APPLE_UIKIT)
+    if(UIKIT)
         if(CMAKE_OSX_ARCHITECTURES)
             list(GET CMAKE_OSX_ARCHITECTURES 0 osx_first_arch)
 
diff --git a/cmake/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
index 5ef2885720..d1c383d697 100644
--- a/cmake/QtInternalTargets.cmake
+++ b/cmake/QtInternalTargets.cmake
@@ -99,13 +99,13 @@ endif()
 
 target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
 
-if(APPLE_MACOS)
+if(MACOS)
     target_compile_definitions(PlatformCommonInternal INTERFACE GL_SILENCE_DEPRECATION)
-elseif(APPLE_UIKIT)
+elseif(UIKIT)
     target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION)
 endif()
 
-if(APPLE_UIKIT)
+if(UIKIT)
     # Do what mkspecs/features/uikit/default_pre.prf does, aka enable sse2 for
     # simulator_and_device_builds.
     if(FEATURE_simulator_and_device)
diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake
index 868433a954..7d057b2ca4 100644
--- a/cmake/QtPlatformSupport.cmake
+++ b/cmake/QtPlatformSupport.cmake
@@ -22,11 +22,11 @@ qt_set01(BSD APPLE OR OPENBSD OR FREEBSD OR NETBSD)
 
 qt_set01(WINRT WIN32 AND CMAKE_VS_PLATFORM_TOOSLET STREQUAL "winrt") # FIXME: How to identify this?
 
-qt_set01(APPLE_IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
-qt_set01(APPLE_TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS")
-qt_set01(APPLE_WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS")
-qt_set01(APPLE_UIKIT APPLE AND (APPLE_IOS OR APPLE_TVOS OR APPLE_WATCHOS))
-qt_set01(APPLE_MACOS APPLE AND NOT APPLE_UIKIT)
+qt_set01(IOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "iOS")
+qt_set01(TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS")
+qt_set01(WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS")
+qt_set01(UIKIT APPLE AND (IOS OR TVOS OR WATCHOS))
+qt_set01(MACOS APPLE AND NOT UIKIT)
 
 qt_set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang")
diff --git a/cmake/QtSetup.cmake b/cmake/QtSetup.cmake
index 6e057e4e66..3b43f44bdd 100644
--- a/cmake/QtSetup.cmake
+++ b/cmake/QtSetup.cmake
@@ -93,7 +93,7 @@ if(FEATURE_developer_build)
 
     # Tests are not built by default with qmake for iOS and friends, and thus the overall build
     # tends to fail. Disable them by default when targeting uikit.
-    if(APPLE_UIKIT OR ANDROID)
+    if(UIKIT OR ANDROID)
         set(QT_BUILD_TESTING OFF)
     endif()
 
@@ -129,7 +129,7 @@ enable_testing()
 set(QT_BUILD_EXAMPLES ON)
 # Examples are not built by default with qmake for iOS and friends, and thus the overall build
 # tends to fail. Disable them by default when targeting uikit.
-if(APPLE_UIKIT OR ANDROID)
+if(UIKIT OR ANDROID)
     set(QT_BUILD_EXAMPLES OFF)
 endif()