diff options
| author | Aurélien Brooke <aurelien@bahiasoft.fr> | 2023-03-30 15:09:01 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-04-13 21:50:29 +0000 |
| commit | b7d3f5ce2adc8fcf624ca25bc73c03d7d1ed8b12 (patch) | |
| tree | f76f9a5ba3af6902bd19ba177882d105b590b723 | |
| parent | d1f5dbba80fe4359103e178369a06bdb8e0f2cee (diff) | |
| download | qt3d-b7d3f5ce2adc8fcf624ca25bc73c03d7d1ed8b12.tar.gz | |
Enable build of Assimp on iOS and tvOS
It compiles and runs perfectly fine.
Change-Id: Id733074567173ee9846e215687a0ab9950c9ab54
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 753efa984eb351429d56983e2ad988d1d29ef1d6)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/plugins/sceneparsers/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/sceneparsers/CMakeLists.txt b/src/plugins/sceneparsers/CMakeLists.txt index f9c2801a4..abc33e92a 100644 --- a/src/plugins/sceneparsers/CMakeLists.txt +++ b/src/plugins/sceneparsers/CMakeLists.txt @@ -4,7 +4,7 @@ # Generated from sceneparsers.pro. add_subdirectory(gltf) -if(QT_FEATURE_qt3d_assimp AND NOT IOS AND NOT TVOS AND NOT QNX +if(QT_FEATURE_qt3d_assimp AND NOT QNX AND (CLANG OR GCC OR QT_FEATURE_qt3d_system_assimp OR (ANDROID AND CLANG) OR MSVC)) add_subdirectory(assimp) endif() |