summaryrefslogtreecommitdiffstats
path: root/src/corelib/.prev_CMakeLists.txt
diff options
context:
space:
mode:
authorTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-03-16 13:37:10 +0100
committerTor Arne Vestbø <tor.arne.vestbo@qt.io>2020-03-16 17:57:52 +0100
commitdb745fdd2dbd57af54f7da637eef6c892824a6fb (patch)
tree4bc3bfbbdb8043eb316606d33a88f009f448598b /src/corelib/.prev_CMakeLists.txt
parent1b7008a3d784f3f266368f824cb43d473a301ba1 (diff)
cmake: Fix naming when referring to Apple macOS
Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/corelib/.prev_CMakeLists.txt')
-rw-r--r--src/corelib/.prev_CMakeLists.txt16
1 files changed, 8 insertions, 8 deletions
diff --git a/src/corelib/.prev_CMakeLists.txt b/src/corelib/.prev_CMakeLists.txt
index 8bdc2debd3..7b0fe80ce4 100644
--- 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}
)