diff options
| author | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 13:37:10 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <tor.arne.vestbo@qt.io> | 2020-03-16 17:57:52 +0100 |
| commit | db745fdd2dbd57af54f7da637eef6c892824a6fb (patch) | |
| tree | 4bc3bfbbdb8043eb316606d33a88f009f448598b /src/gui | |
| parent | 1b7008a3d784f3f266368f824cb43d473a301ba1 (diff) | |
cmake: Fix naming when referring to Apple macOS
Change-Id: Iafb5e448d0d65d42f788464fc600594a5666f9af
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/.prev_CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/gui/CMakeLists.txt | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt index fe6ed3d80a..b8603f1884 100644 --- 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 index f89881210b..922f7aae3a 100644 --- 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 |