cmake: Fix naming when referring to Apple macOS

Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af Reviewed-by: Alexandru Croitor <[email protected]>
o3de · Mar 16, 2020 · db745fd · db745fd
1 parent 1b7008a
commit db745fd
Show file tree

Hide file tree

Showing 50 changed files with 102 additions and 102 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -19,7 +19,7 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
         "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin"
     )
 
-    if(APPLE_OSX)
+    if(APPLE_MACOS)
         # Add module directory to pick up custom Info.plist template
         list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos")
     endif()

diff --git a/cmake/QtBaseGlobalTargets.cmake b/cmake/QtBaseGlobalTargets.cmake
@@ -267,7 +267,7 @@ qt_copy_or_install(DIRECTORY cmake/
     PATTERN "3rdparty" EXCLUDE
 )
 
-if(APPLE_OSX)
+if(APPLE_MACOS)
     qt_copy_or_install(FILES
         cmake/macos/MacOSXBundleInfo.plist.in
         DESTINATION "${__GlobalConfig_install_dir}/macos"

diff --git 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_OSX)
+if(APPLE_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/QtInternalTargets.cmake b/cmake/QtInternalTargets.cmake
@@ -99,7 +99,7 @@ endif()
 
 target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>)
 
-if(APPLE_OSX)
+if(APPLE_MACOS)
     target_compile_definitions(PlatformCommonInternal INTERFACE GL_SILENCE_DEPRECATION)
 elseif(APPLE_UIKIT)
     target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION)

diff --git a/cmake/QtPlatformSupport.cmake b/cmake/QtPlatformSupport.cmake
@@ -26,7 +26,7 @@ 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_OSX APPLE AND NOT APPLE_UIKIT)
+qt_set01(APPLE_MACOS APPLE AND NOT APPLE_UIKIT)
 
 qt_set01(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang")

diff --git a/examples/widgets/CMakeLists.txt b/examples/widgets/CMakeLists.txt
@@ -28,6 +28,6 @@ if(QT_FEATURE_cursor) # special case
     add_subdirectory(mainwindows)
 endif()
 
-if(APPLE_OSX)
+if(APPLE_MACOS)
     add_subdirectory(mac)
 endif()
diff --git a/examples/widgets/mac/CMakeLists.txt b/examples/widgets/mac/CMakeLists.txt
@@ -1,7 +1,7 @@
 # Generated from mac.pro.
 
 
-if(APPLE_OSX)
+if(APPLE_MACOS)
     add_subdirectory(qmaccocoaviewcontainer)
     add_subdirectory(qmacnativewidget)
 endif()
diff --git a/qmake/.prev_CMakeLists.txt b/qmake/.prev_CMakeLists.txt
@@ -162,7 +162,7 @@ qt_extend_target(qmake CONDITION UNIX
         qlocale_unix.cpp-NOTFOUND
 )
 
-qt_extend_target(qmake CONDITION APPLE_OSX
+qt_extend_target(qmake CONDITION APPLE_MACOS
     SOURCES
         qcore_foundation.mm
         qcore_mac.cpp

diff --git a/qmake/CMakeLists.txt b/qmake/CMakeLists.txt
@@ -165,7 +165,7 @@ qt_extend_target(qmake CONDITION UNIX
         ../src/corelib/text/qlocale_unix.cpp
 )
 
-qt_extend_target(qmake CONDITION APPLE_OSX
+qt_extend_target(qmake CONDITION APPLE_MACOS
     SOURCES
         ../src/corelib/kernel/qcore_foundation.mm # special case
         ../src/corelib/kernel/qcore_mac.cpp # special case

diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
@@ -398,7 +398,7 @@ qt_extend_target(Core CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX
+qt_extend_target(Core CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
         ${FWApplicationServices}
@@ -658,7 +658,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
         tools/qtimeline.cpp tools/qtimeline.h
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC)
+qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_MACOS OR NOT ICC)
     LIBRARIES
         m
 )
@@ -692,12 +692,12 @@ qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
         text/qcollator_win.cpp
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu
+qt_extend_target(Core CONDITION APPLE_MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_macx.cpp
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu
+qt_extend_target(Core CONDITION UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_posix.cpp
 )
@@ -784,17 +784,17 @@ qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
         io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher
+qt_extend_target(Core CONDITION APPLE_MACOS AND QT_FEATURE_filesystemwatcher
     SOURCES
         io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_MACOS
     SOURCES
         io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
     SOURCES
         io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h
 )
@@ -866,7 +866,7 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
         io/qprocess_darwin.mm
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX
+qt_extend_target(Core CONDITION APPLE AND NOT APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWMobileCoreServices}
 )

diff --git a/src/corelib/CMakeLists.txt b/src/corelib/CMakeLists.txt
@@ -508,7 +508,7 @@ qt_extend_target(Core CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX
+qt_extend_target(Core CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
         ${FWApplicationServices}
@@ -761,7 +761,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
         tools/qtimeline.cpp tools/qtimeline.h
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_OSX OR NOT ICC)
+qt_extend_target(Core CONDITION UNIX AND NOT HAIKU AND NOT INTEGRITY AND NOT VXWORKS AND NOT WASM AND (NOT APPLE_MACOS OR NOT ICC)
     LIBRARIES
         m
 )
@@ -795,12 +795,12 @@ qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
         text/qcollator_win.cpp
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX AND NOT QT_FEATURE_icu
+qt_extend_target(Core CONDITION APPLE_MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_macx.cpp
 )
 
-qt_extend_target(Core CONDITION UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_icu
+qt_extend_target(Core CONDITION UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_icu
     SOURCES
         text/qcollator_posix.cpp
 )
@@ -887,17 +887,17 @@ qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND WIN32
         io/qfilesystemwatcher_win.cpp io/qfilesystemwatcher_win_p.h
 )
 
-qt_extend_target(Core CONDITION APPLE_OSX AND QT_FEATURE_filesystemwatcher
+qt_extend_target(Core CONDITION APPLE_MACOS AND QT_FEATURE_filesystemwatcher
     SOURCES
         io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_OSX
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND QT_FEATURE_inotify AND UNIX AND NOT APPLE_MACOS
     SOURCES
         io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h
 )
 
-qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_OSX AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
+qt_extend_target(Core CONDITION QT_FEATURE_filesystemwatcher AND UNIX AND NOT APPLE_MACOS AND NOT QT_FEATURE_inotify AND (APPLE OR FREEBSD OR NETBSD OR OPENBSD)
     SOURCES
         io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h
 )
@@ -969,7 +969,7 @@ qt_extend_target(Core CONDITION APPLE AND QT_FEATURE_processenvironment
         io/qprocess_darwin.mm
 )
 
-qt_extend_target(Core CONDITION APPLE AND NOT APPLE_OSX
+qt_extend_target(Core CONDITION APPLE AND NOT APPLE_MACOS
     PUBLIC_LIBRARIES
         ${FWMobileCoreServices}
 )

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
@@ -273,7 +273,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
 #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
 # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
 
-qt_extend_target(Gui CONDITION APPLE_OSX
+qt_extend_target(Gui CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
     PUBLIC_LIBRARIES
@@ -633,7 +633,7 @@ qt_extend_target(Gui CONDITION WASM
         platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
 )
 
-qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX
+qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_MACOS
     SOURCES
         rhi/qrhimetal.mm rhi/qrhimetal_p.h
         rhi/qrhimetal_p_p.h

diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -18,7 +18,7 @@ if (QT_FEATURE_gui)
         set(_default_platform "windows")
     elseif(ANDROID)
         set(_default_platform "android")
-    elseif(APPLE_OSX)
+    elseif(APPLE_MACOS)
         set(_default_platform "cocoa")
     elseif(APPLE_TVOS OR APPLE_IOS)
         set(_default_platform "ios")
@@ -359,7 +359,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
 #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
 # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
 
-qt_extend_target(Gui CONDITION APPLE_OSX
+qt_extend_target(Gui CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
     PUBLIC_LIBRARIES
@@ -778,7 +778,7 @@ qt_extend_target(Gui CONDITION WASM
         platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h
 )
 
-qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_OSX
+qt_extend_target(Gui CONDITION APPLE_IOS OR APPLE_MACOS
     SOURCES
         rhi/qrhimetal.mm rhi/qrhimetal_p.h
         rhi/qrhimetal_p_p.h

diff --git a/src/network/.prev_CMakeLists.txt b/src/network/.prev_CMakeLists.txt
@@ -237,19 +237,19 @@ qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX
+qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS
     SOURCES
         kernel/qnetconmonitor_darwin.mm
     LIBRARIES
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX
+qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_MACOS
     SOURCES
         kernel/qnetconmonitor_win.cpp
 )
 
-qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr
+qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_MACOS AND NOT QT_FEATURE_netlistmgr
     SOURCES
         kernel/qnetconmonitor_stub.cpp
 )
@@ -264,20 +264,20 @@ qt_extend_target(Network CONDITION APPLE_UIKIT
         kernel/qnetworkinterface_uikit_p.h
 )
 
-qt_extend_target(Network CONDITION APPLE_OSX
+qt_extend_target(Network CONDITION APPLE_MACOS
     SOURCES
         kernel/qnetworkproxy_mac.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
+qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_MACOS AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_libproxy.cpp
     LIBRARIES
         ${CMAKE_DL_LIBS}
         PkgConfig::Libproxy
 )
 
-qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+qt_extend_target(Network CONDITION NOT APPLE_MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )

diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt
@@ -237,19 +237,19 @@ qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX
+qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS
     SOURCES
         kernel/qnetconmonitor_darwin.mm
     LIBRARIES
         ${FWSystemConfiguration}
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_OSX
+qt_extend_target(Network CONDITION QT_FEATURE_netlistmgr AND NOT APPLE_IOS AND NOT APPLE_MACOS
     SOURCES
         kernel/qnetconmonitor_win.cpp
 )
 
-qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_OSX AND NOT QT_FEATURE_netlistmgr
+qt_extend_target(Network CONDITION NOT APPLE_IOS AND NOT APPLE_MACOS AND NOT QT_FEATURE_netlistmgr
     SOURCES
         kernel/qnetconmonitor_stub.cpp
 )
@@ -264,20 +264,20 @@ qt_extend_target(Network CONDITION APPLE_UIKIT
         kernel/qnetworkinterface_uikit_p.h
 )
 
-qt_extend_target(Network CONDITION APPLE_OSX
+qt_extend_target(Network CONDITION APPLE_MACOS
     SOURCES
         kernel/qnetworkproxy_mac.cpp
 )
 
-qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UNIX OR WINRT)
+qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_MACOS AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_libproxy.cpp
     LIBRARIES
         ${CMAKE_DL_LIBS}
         PkgConfig::Libproxy
 )
 
-qt_extend_target(Network CONDITION NOT APPLE_OSX AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
+qt_extend_target(Network CONDITION NOT APPLE_MACOS AND NOT QT_FEATURE_libproxy AND (UNIX OR WINRT)
     SOURCES
         kernel/qnetworkproxy_generic.cpp
 )

diff --git a/src/platformsupport/clipboard/CMakeLists.txt b/src/platformsupport/clipboard/CMakeLists.txt
@@ -23,7 +23,7 @@ qt_add_module(ClipboardSupport
 ## Scopes:
 #####################################################################
 
-qt_extend_target(ClipboardSupport CONDITION APPLE_OSX
+qt_extend_target(ClipboardSupport CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
 )
diff --git a/src/platformsupport/fontdatabases/.prev_CMakeLists.txt b/src/platformsupport/fontdatabases/.prev_CMakeLists.txt
@@ -33,12 +33,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX
+qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
     LIBRARIES
         ${FWUIKit}
 )

diff --git a/src/platformsupport/fontdatabases/CMakeLists.txt b/src/platformsupport/fontdatabases/CMakeLists.txt
@@ -36,12 +36,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
         ${FWFoundation}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX
+qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
     LIBRARIES
         ${FWAppKit}
 )
 
-qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX
+qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
     LIBRARIES
         ${FWUIKit}
 )

diff --git 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_OSX)
+if(QT_FEATURE_xkbcommon AND TARGET Qt::DBus AND UNIX AND NOT APPLE_MACOS)
     add_subdirectory(ibus)
 endif()