diff options
| author | Tor Arne Vestbø <torarnv@gmail.com> | 2020-03-16 14:10:44 +0100 |
|---|---|---|
| committer | Tor Arne Vestbø <torarnv@gmail.com> | 2020-03-17 10:42:00 +0100 |
| commit | a5df29201fb795503635ddaae787ade5b96bff5e (patch) | |
| tree | 340a4d8021ce04a58e7252a03c33b6732caee942 /examples/quick | |
| parent | db554e8e1c3242634d035ebb3dcbe3c441d80bdc (diff) | |
CMake: Update Apple platform defines after rename in qtbase
Change-Id: Ia0a075e3199eab735f9b289873beeb8730ebc47e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'examples/quick')
5 files changed, 5 insertions, 5 deletions
diff --git a/examples/quick/scenegraph/.prev_CMakeLists.txt b/examples/quick/scenegraph/.prev_CMakeLists.txt index 040945b9e8..cf72c90b8d 100644 --- a/examples/quick/scenegraph/.prev_CMakeLists.txt +++ b/examples/quick/scenegraph/.prev_CMakeLists.txt @@ -12,7 +12,7 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(textureinthread) add_subdirectory(twotextureproviders) endif() -if(APPLE_IOS OR APPLE_OSX) +if(IOS OR MACOS) add_subdirectory(metalunderqml) add_subdirectory(metaltextureimport) endif() diff --git a/examples/quick/scenegraph/CMakeLists.txt b/examples/quick/scenegraph/CMakeLists.txt index 6dbec6c251..225074556b 100644 --- a/examples/quick/scenegraph/CMakeLists.txt +++ b/examples/quick/scenegraph/CMakeLists.txt @@ -12,7 +12,7 @@ if(QT_FEATURE_opengl OR QT_FEATURE_opengles2 OR QT_FEATURE_opengles3) add_subdirectory(textureinthread) add_subdirectory(twotextureproviders) endif() -if(APPLE_OSX) +if(MACOS) # add_subdirectory(metalunderqml) # special case needs fixing # add_subdirectory(metaltextureimport) # special case TODO endif() diff --git a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt index d84885f4cf..ee2c068cf7 100644 --- a/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt +++ b/examples/quick/scenegraph/metaltextureimport/CMakeLists.txt @@ -43,7 +43,7 @@ qt6_add_resources(metaltextureimport "metaltextureimport" ${metaltextureimport_resource_files} ) -if(APPLE_OSX) +if(MACOS) target_link_libraries(metaltextureimport PUBLIC "-framework AppKit" ) diff --git a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt index cd5136d8ea..fa778e270e 100644 --- a/examples/quick/scenegraph/metalunderqml/CMakeLists.txt +++ b/examples/quick/scenegraph/metalunderqml/CMakeLists.txt @@ -43,7 +43,7 @@ qt6_add_resources(metalunderqml "metalunderqml" ${metalunderqml_resource_files} ) -if(APPLE_OSX) +if(MACOS) target_link_libraries(metalunderqml PUBLIC "-framework AppKit" ) diff --git a/examples/quick/scenegraph/rendernode/CMakeLists.txt b/examples/quick/scenegraph/rendernode/CMakeLists.txt index f607e6e638..c2de412b64 100644 --- a/examples/quick/scenegraph/rendernode/CMakeLists.txt +++ b/examples/quick/scenegraph/rendernode/CMakeLists.txt @@ -44,7 +44,7 @@ qt6_add_resources(rendernode "rendernode" ${rendernode_resource_files} ) -if(APPLE_OSX) +if(MACOS) target_sources(rendernode PUBLIC metalrenderer.h metalrenderer.mm ) |