1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cmake: Fix naming when referring to Apple macOS

Browse Source 
Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
This commit is contained in:
Tor Arne Vestbø 2020-03-16 13:37:10 +01:00
parent 1b7008a3d7
commit db745fdd2d
50 changed files with 102 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -19,7 +19,7 @@ if(NOT QT_BUILD_STANDALONE_TESTS)
"${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin" "${CMAKE_CURRENT_SOURCE_DIR}/cmake/3rdparty/kwin"
) )
if(APPLE_OSX) if(APPLE_MACOS)
# Add module directory to pick up custom Info.plist template # Add module directory to pick up custom Info.plist template
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos") list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/macos")
endif() endif()

2
cmake/QtBaseGlobalTargets.cmake
View File

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

2
cmake/QtConfig.cmake.in
View File

@ -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/extra-cmake-modules/find-modules")
list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/3rdparty/kwin") 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 # Add module directory to pick up custom Info.plist template
list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/macos") list(APPEND CMAKE_MODULE_PATH "${_qt_import_prefix}/macos")
endif() endif()

2
cmake/QtInternalTargets.cmake
View File

@ -99,7 +99,7 @@ endif()
target_compile_definitions(PlatformCommonInternal INTERFACE $<$<NOT:$<CONFIG:Debug>>:QT_NO_DEBUG>) 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) target_compile_definitions(PlatformCommonInternal INTERFACE GL_SILENCE_DEPRECATION)
elseif(APPLE_UIKIT) elseif(APPLE_UIKIT)
target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION) target_compile_definitions(PlatformCommonInternal INTERFACE GLES_SILENCE_DEPRECATION)

2
cmake/QtPlatformSupport.cmake
View File

@ -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_TVOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "tvOS")
qt_set01(APPLE_WATCHOS APPLE AND CMAKE_SYSTEM_NAME STREQUAL "watchOS") 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_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(GCC CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang") qt_set01(CLANG CMAKE_CXX_COMPILER_ID MATCHES "Clang")

2
examples/widgets/CMakeLists.txt
View File

@ -28,6 +28,6 @@ if(QT_FEATURE_cursor) # special case
add_subdirectory(mainwindows) add_subdirectory(mainwindows)
endif() endif()
if(APPLE_OSX) if(APPLE_MACOS)
add_subdirectory(mac) add_subdirectory(mac)
endif() endif()

2
examples/widgets/mac/CMakeLists.txt
View File

@ -1,7 +1,7 @@
# Generated from mac.pro. # Generated from mac.pro.
if(APPLE_OSX) if(APPLE_MACOS)
add_subdirectory(qmaccocoaviewcontainer) add_subdirectory(qmaccocoaviewcontainer)
add_subdirectory(qmacnativewidget) add_subdirectory(qmacnativewidget)
endif() endif()

2
qmake/.prev_CMakeLists.txt
View File

@ -162,7 +162,7 @@ qt_extend_target(qmake CONDITION UNIX
qlocale_unix.cpp-NOTFOUND qlocale_unix.cpp-NOTFOUND
) )
qt_extend_target(qmake CONDITION APPLE_OSX qt_extend_target(qmake CONDITION APPLE_MACOS
SOURCES SOURCES
qcore_foundation.mm qcore_foundation.mm
qcore_mac.cpp qcore_mac.cpp

2
qmake/CMakeLists.txt
View File

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

16
src/corelib/.prev_CMakeLists.txt
View File

@ -398,7 +398,7 @@ qt_extend_target(Core CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
qt_extend_target(Core CONDITION APPLE_OSX qt_extend_target(Core CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
${FWApplicationServices} ${FWApplicationServices}
@ -658,7 +658,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
tools/qtimeline.cpp tools/qtimeline.h 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 LIBRARIES
m m
) )
@ -692,12 +692,12 @@ qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
text/qcollator_win.cpp 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 SOURCES
text/qcollator_macx.cpp 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 SOURCES
text/qcollator_posix.cpp 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 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 SOURCES
io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h 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 SOURCES
io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h 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 SOURCES
io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h 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 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 PUBLIC_LIBRARIES
${FWMobileCoreServices} ${FWMobileCoreServices}
) )

16
src/corelib/CMakeLists.txt
View File

@ -508,7 +508,7 @@ qt_extend_target(Core CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
qt_extend_target(Core CONDITION APPLE_OSX qt_extend_target(Core CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
${FWApplicationServices} ${FWApplicationServices}
@ -761,7 +761,7 @@ qt_extend_target(Core CONDITION QT_FEATURE_easingcurve
tools/qtimeline.cpp tools/qtimeline.h 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 LIBRARIES
m m
) )
@ -795,12 +795,12 @@ qt_extend_target(Core CONDITION WIN32 AND NOT QT_FEATURE_icu
text/qcollator_win.cpp 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 SOURCES
text/qcollator_macx.cpp 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 SOURCES
text/qcollator_posix.cpp 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 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 SOURCES
io/qfilesystemwatcher_fsevents.mm io/qfilesystemwatcher_fsevents_p.h 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 SOURCES
io/qfilesystemwatcher_inotify.cpp io/qfilesystemwatcher_inotify_p.h 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 SOURCES
io/qfilesystemwatcher_kqueue.cpp io/qfilesystemwatcher_kqueue_p.h 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 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 PUBLIC_LIBRARIES
${FWMobileCoreServices} ${FWMobileCoreServices}
) )

4
src/gui/.prev_CMakeLists.txt
View File

@ -273,7 +273,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
#### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle: #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
qt_extend_target(Gui CONDITION APPLE_OSX qt_extend_target(Gui CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -633,7 +633,7 @@ qt_extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h 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 SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal.mm rhi/qrhimetal_p.h
rhi/qrhimetal_p_p.h rhi/qrhimetal_p_p.h

6
src/gui/CMakeLists.txt
View File

@ -18,7 +18,7 @@ if (QT_FEATURE_gui)
set(_default_platform "windows") set(_default_platform "windows")
elseif(ANDROID) elseif(ANDROID)
set(_default_platform "android") set(_default_platform "android")
elseif(APPLE_OSX) elseif(APPLE_MACOS)
set(_default_platform "cocoa") set(_default_platform "cocoa")
elseif(APPLE_TVOS OR APPLE_IOS) elseif(APPLE_TVOS OR APPLE_IOS)
set(_default_platform "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: #### Keys ignored in scope 3:.:.:gui.pro:QT_FEATURE_angle:
# MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE" # MODULE_AUX_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/QtANGLE"
qt_extend_target(Gui CONDITION APPLE_OSX qt_extend_target(Gui CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -778,7 +778,7 @@ qt_extend_target(Gui CONDITION WASM
platform/wasm/qwasmlocalfileaccess.cpp platform/wasm/qwasmlocalfileaccess_p.h 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 SOURCES
rhi/qrhimetal.mm rhi/qrhimetal_p.h rhi/qrhimetal.mm rhi/qrhimetal_p.h
rhi/qrhimetal_p_p.h rhi/qrhimetal_p_p.h

12
src/network/.prev_CMakeLists.txt
View File

@ -237,19 +237,19 @@ qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
${FWSystemConfiguration} ${FWSystemConfiguration}
) )
qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS
SOURCES SOURCES
kernel/qnetconmonitor_darwin.mm kernel/qnetconmonitor_darwin.mm
LIBRARIES LIBRARIES
${FWSystemConfiguration} ${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 SOURCES
kernel/qnetconmonitor_win.cpp 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 SOURCES
kernel/qnetconmonitor_stub.cpp kernel/qnetconmonitor_stub.cpp
) )
@ -264,12 +264,12 @@ qt_extend_target(Network CONDITION APPLE_UIKIT
kernel/qnetworkinterface_uikit_p.h kernel/qnetworkinterface_uikit_p.h
) )
qt_extend_target(Network CONDITION APPLE_OSX qt_extend_target(Network CONDITION APPLE_MACOS
SOURCES SOURCES
kernel/qnetworkproxy_mac.cpp 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 SOURCES
kernel/qnetworkproxy_libproxy.cpp kernel/qnetworkproxy_libproxy.cpp
LIBRARIES LIBRARIES
@ -277,7 +277,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UN
PkgConfig::Libproxy 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 SOURCES
kernel/qnetworkproxy_generic.cpp kernel/qnetworkproxy_generic.cpp
) )

12
src/network/CMakeLists.txt
View File

@ -237,19 +237,19 @@ qt_extend_target(Network CONDITION APPLE AND NOT APPLE_UIKIT
${FWSystemConfiguration} ${FWSystemConfiguration}
) )
qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_OSX qt_extend_target(Network CONDITION APPLE_IOS OR APPLE_MACOS
SOURCES SOURCES
kernel/qnetconmonitor_darwin.mm kernel/qnetconmonitor_darwin.mm
LIBRARIES LIBRARIES
${FWSystemConfiguration} ${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 SOURCES
kernel/qnetconmonitor_win.cpp 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 SOURCES
kernel/qnetconmonitor_stub.cpp kernel/qnetconmonitor_stub.cpp
) )
@ -264,12 +264,12 @@ qt_extend_target(Network CONDITION APPLE_UIKIT
kernel/qnetworkinterface_uikit_p.h kernel/qnetworkinterface_uikit_p.h
) )
qt_extend_target(Network CONDITION APPLE_OSX qt_extend_target(Network CONDITION APPLE_MACOS
SOURCES SOURCES
kernel/qnetworkproxy_mac.cpp 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 SOURCES
kernel/qnetworkproxy_libproxy.cpp kernel/qnetworkproxy_libproxy.cpp
LIBRARIES LIBRARIES
@ -277,7 +277,7 @@ qt_extend_target(Network CONDITION QT_FEATURE_libproxy AND NOT APPLE_OSX AND (UN
PkgConfig::Libproxy 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 SOURCES
kernel/qnetworkproxy_generic.cpp kernel/qnetworkproxy_generic.cpp
) )

2
src/platformsupport/clipboard/CMakeLists.txt
View File

@ -23,7 +23,7 @@ qt_add_module(ClipboardSupport
## Scopes: ## Scopes:
##################################################################### #####################################################################
qt_extend_target(ClipboardSupport CONDITION APPLE_OSX qt_extend_target(ClipboardSupport CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
) )

4
src/platformsupport/fontdatabases/.prev_CMakeLists.txt
View File

@ -33,12 +33,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
) )
qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
LIBRARIES LIBRARIES
${FWUIKit} ${FWUIKit}
) )

4
src/platformsupport/fontdatabases/CMakeLists.txt
View File

@ -36,12 +36,12 @@ qt_extend_target(FontDatabaseSupport CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
qt_extend_target(FontDatabaseSupport CONDITION APPLE_OSX qt_extend_target(FontDatabaseSupport CONDITION APPLE_MACOS
LIBRARIES LIBRARIES
${FWAppKit} ${FWAppKit}
) )
qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_OSX qt_extend_target(FontDatabaseSupport CONDITION APPLE AND NOT APPLE_MACOS
LIBRARIES LIBRARIES
${FWUIKit} ${FWUIKit}
) )

2
src/plugins/platforminputcontexts/CMakeLists.txt
View File

@ -3,6 +3,6 @@
if(QT_FEATURE_xkbcommon) if(QT_FEATURE_xkbcommon)
add_subdirectory(compose) add_subdirectory(compose)
endif() 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) add_subdirectory(ibus)
endif() endif()

2
src/plugins/platforms/.prev_CMakeLists.txt
View File

@ -15,7 +15,7 @@ endif()
if(APPLE_UIKIT AND NOT APPLE_WATCHOS) if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
add_subdirectory(ios) add_subdirectory(ios)
endif() endif()
if(APPLE_OSX) if(APPLE_MACOS)
add_subdirectory(cocoa) add_subdirectory(cocoa)
endif() endif()
if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT) if(QT_FEATURE_direct3d9 AND WIN32 AND NOT WINRT)

2
src/plugins/platforms/CMakeLists.txt
View File

@ -15,7 +15,7 @@ endif()
if(APPLE_UIKIT AND NOT APPLE_WATCHOS) if(APPLE_UIKIT AND NOT APPLE_WATCHOS)
add_subdirectory(ios) add_subdirectory(ios)
endif() endif()
if(APPLE_OSX) if(APPLE_MACOS)
add_subdirectory(cocoa) add_subdirectory(cocoa)
endif() endif()
if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test if(WIN32 AND NOT WINRT) # special case TODO fix direct3d9 test

2
src/plugins/printsupport/.prev_CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from printsupport.pro. # Generated from printsupport.pro.
if(APPLE_OSX) if(APPLE_MACOS)
add_subdirectory(cocoa) add_subdirectory(cocoa)
endif() endif()
if(WIN32) if(WIN32)

2
src/plugins/printsupport/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from printsupport.pro. # Generated from printsupport.pro.
if(APPLE_OSX) if(APPLE_MACOS)
add_subdirectory(cocoa) add_subdirectory(cocoa)
endif() endif()
if(WIN32) if(WIN32)

2
src/printsupport/CMakeLists.txt
View File

@ -143,7 +143,7 @@ if(QT_FEATURE_printdialog)
) )
endif() endif()
qt_extend_target(PrintSupport CONDITION APPLE_OSX AND QT_FEATURE_printdialog qt_extend_target(PrintSupport CONDITION APPLE_MACOS AND QT_FEATURE_printdialog
SOURCES SOURCES
dialogs/qpagesetupdialog_mac.mm dialogs/qpagesetupdialog_mac.mm
dialogs/qprintdialog_mac.mm dialogs/qprintdialog_mac.mm

2
src/testlib/.prev_CMakeLists.txt
View File

@ -101,7 +101,7 @@ qt_extend_target(Test CONDITION APPLE
${FWSecurity} ${FWSecurity}
) )
qt_extend_target(Test CONDITION APPLE_OSX qt_extend_target(Test CONDITION APPLE_MACOS
SOURCES SOURCES
qtestutil_macos.mm qtestutil_macos_p.h qtestutil_macos.mm qtestutil_macos_p.h
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

6
src/testlib/CMakeLists.txt
View File

@ -99,7 +99,7 @@ qt_extend_target(Test CONDITION APPLE
${FWSecurity} ${FWSecurity}
) )
qt_extend_target(Test CONDITION APPLE_OSX qt_extend_target(Test CONDITION APPLE_MACOS
SOURCES SOURCES
qtestutil_macos.mm qtestutil_macos_p.h qtestutil_macos.mm qtestutil_macos_p.h
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
@ -111,8 +111,8 @@ qt_extend_target(Test CONDITION APPLE_OSX
# special case begin # special case begin
# Do not bother with disabled stuff: # Do not bother with disabled stuff:
# extend_target(Test CONDITION (APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ... # extend_target(Test CONDITION (APPLE_MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0")) ...
# extend_target(Test CONDITION ((APPLE_OSX) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ... # extend_target(Test CONDITION ((APPLE_MACOS) AND (OFF AND NOT lessThan(QMAKE_XCODE_VERSION, "6.0"))) AND (NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY) ...
# special case end # special case end
#### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY: #### Keys ignored in scope 9:.:.:testlib.pro:NOT QMAKE_MAC_SDK_PLATFORM_PATH_ISEMPTY:

4
src/tools/bootstrap/.prev_CMakeLists.txt
View File

@ -174,7 +174,7 @@ qt_extend_target(Bootstrap CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
qt_extend_target(Bootstrap CONDITION APPLE_OSX qt_extend_target(Bootstrap CONDITION APPLE_MACOS
SOURCES SOURCES
../../corelib/io/qstandardpaths_mac.mm ../../corelib/io/qstandardpaths_mac.mm
LIBRARIES LIBRARIES
@ -186,7 +186,7 @@ qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
${FWUIKit} ${FWUIKit}
) )
qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_MACOS
SOURCES SOURCES
../../corelib/io/qstandardpaths_unix.cpp ../../corelib/io/qstandardpaths_unix.cpp
) )

4
src/tools/bootstrap/CMakeLists.txt
View File

@ -174,7 +174,7 @@ qt_extend_target(Bootstrap CONDITION APPLE
${FWFoundation} ${FWFoundation}
) )
qt_extend_target(Bootstrap CONDITION APPLE_OSX qt_extend_target(Bootstrap CONDITION APPLE_MACOS
SOURCES SOURCES
../../corelib/io/qstandardpaths_mac.mm ../../corelib/io/qstandardpaths_mac.mm
LIBRARIES LIBRARIES
@ -186,7 +186,7 @@ qt_extend_target(Bootstrap CONDITION APPLE_UIKIT
${FWUIKit} ${FWUIKit}
) )
qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_OSX qt_extend_target(Bootstrap CONDITION UNIX AND NOT APPLE_MACOS
SOURCES SOURCES
../../corelib/io/qstandardpaths_unix.cpp ../../corelib/io/qstandardpaths_unix.cpp
) )

4
src/widgets/.prev_CMakeLists.txt
View File

@ -296,7 +296,7 @@ qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3
"/BASE:0x65000000" "/BASE:0x65000000"
) )
qt_extend_target(Widgets CONDITION APPLE_OSX qt_extend_target(Widgets CONDITION APPLE_MACOS
SOURCES SOURCES
kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm
@ -594,7 +594,7 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
widgets/qwidgettextcontrol_p_p.h widgets/qwidgettextcontrol_p_p.h
) )
qt_extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) qt_extend_target(Widgets CONDITION APPLE_MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
SOURCES SOURCES
widgets/qmenu_mac.mm widgets/qmenu_mac.mm
) )

4
src/widgets/CMakeLists.txt
View File

@ -298,7 +298,7 @@ qt_extend_target(Widgets CONDITION MSVC AND (TEST_architecture_arch STREQUAL "i3
"/BASE:0x65000000" "/BASE:0x65000000"
) )
qt_extend_target(Widgets CONDITION APPLE_OSX qt_extend_target(Widgets CONDITION APPLE_MACOS
SOURCES SOURCES
kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h kernel/qmacgesturerecognizer.cpp kernel/qmacgesturerecognizer_p.h
widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm widgets/qmaccocoaviewcontainer_mac.h widgets/qmaccocoaviewcontainer_mac.mm
@ -596,7 +596,7 @@ qt_extend_target(Widgets CONDITION QT_FEATURE_widgettextcontrol
widgets/qwidgettextcontrol_p_p.h widgets/qwidgettextcontrol_p_p.h
) )
qt_extend_target(Widgets CONDITION APPLE_OSX AND (QT_FEATURE_menu OR QT_FEATURE_menubar) qt_extend_target(Widgets CONDITION APPLE_MACOS AND (QT_FEATURE_menu OR QT_FEATURE_menubar)
SOURCES SOURCES
widgets/qmenu_mac.mm widgets/qmenu_mac.mm
) )

2
src/widgets/configure.cmake
View File

@ -25,7 +25,7 @@ qt_feature("style-fusion" PRIVATE
) )
qt_feature("style-mac" PRIVATE qt_feature("style-mac" PRIVATE
LABEL "macOS" LABEL "macOS"
CONDITION APPLE_OSX AND QT_FEATURE_animation CONDITION APPLE_MACOS AND QT_FEATURE_animation
) )
qt_feature("style-windows" PRIVATE qt_feature("style-windows" PRIVATE
LABEL "Windows" LABEL "Windows"

2
tests/auto/corelib/plugin/qpluginloader/CMakeLists.txt
View File

@ -7,6 +7,6 @@ add_subdirectory(tst)
if(UNIX AND NOT ANDROID AND NOT APPLE) if(UNIX AND NOT ANDROID AND NOT APPLE)
add_subdirectory(almostplugin) add_subdirectory(almostplugin)
endif() endif()
if(APPLE_OSX AND QT_FEATURE_private_tests AND TARGET Qt::Gui) if(APPLE_MACOS AND QT_FEATURE_private_tests AND TARGET Qt::Gui)
add_subdirectory(machtest) add_subdirectory(machtest)
endif() endif()

2
tests/auto/gui/kernel/qclipboard/test/.prev_CMakeLists.txt
View File

@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qclipboard CONDITION APPLE_OSX extend_target(tst_qclipboard CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWAppKit} ${FWAppKit}
) )

2
tests/auto/gui/kernel/qclipboard/test/CMakeLists.txt
View File

@ -15,7 +15,7 @@ add_qt_test(tst_qclipboard
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qclipboard CONDITION APPLE_OSX extend_target(tst_qclipboard CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWAppKit} ${FWAppKit}
) )

2
tests/auto/network/kernel/CMakeLists.txt
View File

@ -13,7 +13,7 @@ endif()
if(QT_FEATURE_private_tests) if(QT_FEATURE_private_tests)
add_subdirectory(qauthenticator) add_subdirectory(qauthenticator)
if(NOT APPLE_OSX) if(NOT APPLE_MACOS)
add_subdirectory(qhostinfo) add_subdirectory(qhostinfo)
endif() endif()
endif() endif()

4
tests/auto/other/CMakeLists.txt
View File

@ -15,7 +15,7 @@ if(TARGET Qt::Network AND TARGET Qt::Widgets AND NOT WINRT)
add_subdirectory(lancelot) add_subdirectory(lancelot)
add_subdirectory(qnetworkaccessmanager_and_qprogressdialog) add_subdirectory(qnetworkaccessmanager_and_qprogressdialog)
endif() endif()
if(APPLE_OSX AND TARGET Qt::Gui AND TARGET Qt::Widgets) if(APPLE_MACOS AND TARGET Qt::Gui AND TARGET Qt::Widgets)
add_subdirectory(macgui) add_subdirectory(macgui)
add_subdirectory(macplist) add_subdirectory(macplist)
add_subdirectory(qaccessibilitymac) add_subdirectory(qaccessibilitymac)
@ -35,7 +35,7 @@ endif()
if(TARGET Qt::Network AND NOT WINRT) if(TARGET Qt::Network AND NOT WINRT)
add_subdirectory(networkselftest) add_subdirectory(networkselftest)
endif() endif()
if(APPLE_OSX AND TARGET Qt::Gui) if(APPLE_MACOS AND TARGET Qt::Gui)
add_subdirectory(macnativeevents) add_subdirectory(macnativeevents)
endif() endif()
if(embedded) if(embedded)

2
tests/auto/other/macgui/.prev_CMakeLists.txt
View File

@ -26,7 +26,7 @@ add_qt_test(tst_macgui
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_macgui CONDITION APPLE_OSX extend_target(tst_macgui CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWApplicationServices} ${FWApplicationServices}
) )

2
tests/auto/other/macgui/CMakeLists.txt
View File

@ -26,7 +26,7 @@ add_qt_test(tst_macgui
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_macgui CONDITION APPLE_OSX extend_target(tst_macgui CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWApplicationServices} ${FWApplicationServices}
) )

2
tests/auto/widgets/dialogs/qfilesystemmodel/CMakeLists.txt
View File

@ -23,5 +23,5 @@ add_qt_test(tst_qfilesystemmodel
#### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32: #### Keys ignored in scope 2:.:.:qfilesystemmodel.pro:WIN32:
# testcase.timeout = "900" # testcase.timeout = "900"
#### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_OSX: #### Keys ignored in scope 3:.:.:qfilesystemmodel.pro:APPLE_MACOS:
# testcase.timeout = "900" # testcase.timeout = "900"

2
tests/auto/widgets/styles/CMakeLists.txt
View File

@ -1,6 +1,6 @@
# Generated from styles.pro. # Generated from styles.pro.
if (APPLE_OSX) if (APPLE_MACOS)
add_subdirectory(qmacstyle) add_subdirectory(qmacstyle)
endif() endif()
add_subdirectory(qstyle) add_subdirectory(qstyle)

2
tests/auto/widgets/widgets/qlineedit/CMakeLists.txt
View File

@ -19,7 +19,7 @@ add_qt_test(tst_qlineedit
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qlineedit CONDITION APPLE_OSX extend_target(tst_qlineedit CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWAppKit} ${FWAppKit}
) )

4
tests/auto/widgets/widgets/qmenu/CMakeLists.txt
View File

@ -17,14 +17,14 @@ add_qt_test(tst_qmenu
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qmenu CONDITION APPLE_OSX extend_target(tst_qmenu CONDITION APPLE_MACOS
SOURCES SOURCES
tst_qmenu_mac.mm tst_qmenu_mac.mm
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
objc objc
) )
extend_target(tst_qmenu CONDITION NOT APPLE_OSX extend_target(tst_qmenu CONDITION NOT APPLE_MACOS
DEFINES DEFINES
QTEST_QPA_MOUSE_HANDLING QTEST_QPA_MOUSE_HANDLING
) )

2
tests/auto/widgets/widgets/qmenubar/CMakeLists.txt
View File

@ -16,7 +16,7 @@ add_qt_test(tst_qmenubar
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qmenubar CONDITION APPLE_OSX extend_target(tst_qmenubar CONDITION APPLE_MACOS
SOURCES SOURCES
tst_qmenubar_mac.mm tst_qmenubar_mac.mm
PUBLIC_LIBRARIES PUBLIC_LIBRARIES

2
tests/auto/widgets/widgets/qplaintextedit/CMakeLists.txt
View File

@ -19,7 +19,7 @@ add_qt_test(tst_qplaintextedit
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qplaintextedit CONDITION APPLE_OSX extend_target(tst_qplaintextedit CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWAppKit} ${FWAppKit}
) )

2
tests/auto/widgets/widgets/qtextedit/CMakeLists.txt
View File

@ -22,7 +22,7 @@ add_qt_test(tst_qtextedit
## Scopes: ## Scopes:
##################################################################### #####################################################################
extend_target(tst_qtextedit CONDITION APPLE_OSX extend_target(tst_qtextedit CONDITION APPLE_MACOS
PUBLIC_LIBRARIES PUBLIC_LIBRARIES
${FWAppKit} ${FWAppKit}
) )

2
util/cmake/condition_simplifier.py
View File

@ -106,7 +106,7 @@ def _recursive_simplify(expr):
# Simplify even further, based on domain knowledge: # Simplify even further, based on domain knowledge:
# windowses = ('WIN32', 'WINRT') # windowses = ('WIN32', 'WINRT')
apples = ("APPLE_OSX", "APPLE_UIKIT", "APPLE_IOS", "APPLE_TVOS", "APPLE_WATCHOS") apples = ("APPLE_MACOS", "APPLE_UIKIT", "APPLE_IOS", "APPLE_TVOS", "APPLE_WATCHOS")
bsds = ("FREEBSD", "OPENBSD", "NETBSD") bsds = ("FREEBSD", "OPENBSD", "NETBSD")
androids = ("ANDROID", "ANDROID_EMBEDDED") androids = ("ANDROID", "ANDROID_EMBEDDED")
unixes = ( unixes = (

8
util/cmake/helper.py
View File

@ -668,7 +668,7 @@ platform_mapping = {
"gcc": "GCC", "gcc": "GCC",
"icc": "ICC", "icc": "ICC",
"intel_icc": "ICC", "intel_icc": "ICC",
"osx": "APPLE_OSX", "osx": "APPLE_MACOS",
"ios": "APPLE_IOS", "ios": "APPLE_IOS",
"freebsd": "FREEBSD", "freebsd": "FREEBSD",
"openbsd": "OPENBSD", "openbsd": "OPENBSD",
@ -676,9 +676,9 @@ platform_mapping = {
"haiku": "HAIKU", "haiku": "HAIKU",
"netbsd": "NETBSD", "netbsd": "NETBSD",
"mac": "APPLE", "mac": "APPLE",
"macx": "APPLE_OSX", "macx": "APPLE_MACOS",
"macos": "APPLE_OSX", "macos": "APPLE_MACOS",
"macx-icc": "(APPLE_OSX AND ICC)", "macx-icc": "(APPLE_MACOS AND ICC)",
} }

2
util/cmake/pro2cmake.py
View File

@ -1444,7 +1444,7 @@ def map_condition(condition: str) -> str:
condition = re.sub(r"^no-png$", r"NOT QT_FEATURE_png", condition) condition = re.sub(r"^no-png$", r"NOT QT_FEATURE_png", condition)
condition = re.sub(r"contains\(CONFIG, static\)", r"NOT QT_BUILD_SHARED_LIBS", condition) condition = re.sub(r"contains\(CONFIG, static\)", r"NOT QT_BUILD_SHARED_LIBS", condition)
condition = re.sub(r"contains\(QT_CONFIG,\w*shared\)", r"QT_BUILD_SHARED_LIBS", condition) condition = re.sub(r"contains\(QT_CONFIG,\w*shared\)", r"QT_BUILD_SHARED_LIBS", condition)
condition = re.sub(r"CONFIG\(osx\)", r"APPLE_OSX", condition) condition = re.sub(r"CONFIG\(osx\)", r"APPLE_MACOS", condition)
def gcc_version_handler(match_obj: Match): def gcc_version_handler(match_obj: Match):
operator = match_obj.group(1) operator = match_obj.group(1)

18
util/cmake/tests/test_logic_mapping.py
View File

@ -124,34 +124,34 @@ def test_simplify_win32_and_watchos():
def test_simplify_apple_and_appleosx(): def test_simplify_apple_and_appleosx():
validate_simplify('APPLE AND APPLE_OSX', 'APPLE_OSX') validate_simplify('APPLE AND APPLE_MACOS', 'APPLE_MACOS')
def test_simplify_apple_or_appleosx(): def test_simplify_apple_or_appleosx():
validate_simplify('APPLE OR APPLE_OSX', 'APPLE') validate_simplify('APPLE OR APPLE_MACOS', 'APPLE')
def test_simplify_apple_or_appleosx_level1(): def test_simplify_apple_or_appleosx_level1():
validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar') validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar')
def test_simplify_apple_or_appleosx_level1_double(): def test_simplify_apple_or_appleosx_level1_double():
validate_simplify('foobar AND (APPLE OR APPLE_OSX )', 'APPLE AND foobar') validate_simplify('foobar AND (APPLE OR APPLE_MACOS )', 'APPLE AND foobar')
def test_simplify_apple_or_appleosx_level1_double_with_extra_spaces(): def test_simplify_apple_or_appleosx_level1_double_with_extra_spaces():
validate_simplify('foobar AND (APPLE OR APPLE_OSX ) ' validate_simplify('foobar AND (APPLE OR APPLE_MACOS ) '
'AND ( APPLE_OSX OR APPLE )', 'APPLE AND foobar') 'AND ( APPLE_MACOS OR APPLE )', 'APPLE AND foobar')
def test_simplify_apple_or_appleosx_level2(): def test_simplify_apple_or_appleosx_level2():
validate_simplify('foobar AND ( ( APPLE OR APPLE_WATCHOS ) ' validate_simplify('foobar AND ( ( APPLE OR APPLE_WATCHOS ) '
'OR APPLE_OSX ) AND ( APPLE_OSX OR APPLE ) ' 'OR APPLE_MACOS ) AND ( APPLE_MACOS OR APPLE ) '
'AND ( (WIN32 OR WINRT) OR UNIX) ', 'APPLE AND foobar') 'AND ( (WIN32 OR WINRT) OR UNIX) ', 'APPLE AND foobar')
def test_simplify_not_apple_and_appleosx(): def test_simplify_not_apple_and_appleosx():
validate_simplify('NOT APPLE AND APPLE_OSX', 'OFF') validate_simplify('NOT APPLE AND APPLE_MACOS', 'OFF')
def test_simplify_unix_and_bar_or_win32(): def test_simplify_unix_and_bar_or_win32():
@ -182,5 +182,5 @@ def test_simplify_complex_false():
def test_simplify_android_not_apple(): def test_simplify_android_not_apple():
validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_OSX', validate_simplify('ANDROID AND NOT ANDROID_EMBEDDED AND NOT APPLE_MACOS',
'ANDROID AND NOT ANDROID_EMBEDDED') 'ANDROID AND NOT ANDROID_EMBEDDED')

10
util/cmake/tests/test_scope_handling.py
View File

@ -305,7 +305,7 @@ def test_qstandardpaths_scopes():
scope6 = _new_scope(parent_scope=scope5, condition='UNIX') scope6 = _new_scope(parent_scope=scope5, condition='UNIX')
# mac { # mac {
# OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm # OBJECTIVE_SOURCES += io/qstandardpaths_mac.mm
scope7 = _new_scope(parent_scope=scope6, condition='APPLE_OSX', SOURCES='qsp_mac.mm') scope7 = _new_scope(parent_scope=scope6, condition='APPLE_MACOS', SOURCES='qsp_mac.mm')
# } else:android:!android-embedded { # } else:android:!android-embedded {
# SOURCES += io/qstandardpaths_android.cpp # SOURCES += io/qstandardpaths_android.cpp
scope8 = _new_scope(parent_scope=scope6, condition='else') scope8 = _new_scope(parent_scope=scope6, condition='else')
@ -330,12 +330,12 @@ def test_qstandardpaths_scopes():
assert scope4.total_condition == 'WINRT' assert scope4.total_condition == 'WINRT'
assert scope5.total_condition == 'UNIX' assert scope5.total_condition == 'UNIX'
assert scope6.total_condition == 'UNIX' assert scope6.total_condition == 'UNIX'
assert scope7.total_condition == 'APPLE_OSX' assert scope7.total_condition == 'APPLE_MACOS'
assert scope8.total_condition == 'UNIX AND NOT APPLE_OSX' assert scope8.total_condition == 'UNIX AND NOT APPLE_MACOS'
assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED' assert scope9.total_condition == 'ANDROID AND NOT ANDROID_EMBEDDED'
assert scope10.total_condition == 'UNIX AND NOT APPLE_OSX AND (ANDROID_EMBEDDED OR NOT ANDROID)' assert scope10.total_condition == 'UNIX AND NOT APPLE_MACOS AND (ANDROID_EMBEDDED OR NOT ANDROID)'
assert scope11.total_condition == 'HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' assert scope11.total_condition == 'HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)'
assert scope12.total_condition == 'UNIX AND NOT APPLE_OSX AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)' assert scope12.total_condition == 'UNIX AND NOT APPLE_MACOS AND NOT HAIKU AND (ANDROID_EMBEDDED OR NOT ANDROID)'
def test_recursive_expansion(): def test_recursive_expansion():
scope = _new_scope(A='Foo',B='$$A/Bar') scope = _new_scope(A='Foo',B='$$A/Bar')