diff options
Diffstat (limited to 'src/3rdparty/assimp/assimp.cmake')
| -rw-r--r-- | src/3rdparty/assimp/assimp.cmake | 22 |
1 files changed, 19 insertions, 3 deletions
diff --git a/src/3rdparty/assimp/assimp.cmake b/src/3rdparty/assimp/assimp.cmake index 36678cac0..30c77d55e 100644 --- a/src/3rdparty/assimp/assimp.cmake +++ b/src/3rdparty/assimp/assimp.cmake @@ -22,11 +22,13 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/Collada/ColladaLoader.cpp ${assimpDir}/src/code/AssetLib/Collada/ColladaLoader.h ${assimpDir}/src/code/AssetLib/Collada/ColladaParser.cpp ${assimpDir}/src/code/AssetLib/Collada/ColladaParser.h ${assimpDir}/src/code/Common/Assimp.cpp - ${assimpDir}/src/code/Common/AssertHandler.cpp ${assimpDir}/src/code/Common/AssertHandler.h + ${assimpDir}/src/code/Common/AssertHandler.cpp ${assimpDir}/src/include/assimp/AssertHandler.h + ${assimpDir}/src/code/Common/Base64.cpp ${assimpDir}/src/include/assimp/Base64.hpp ${assimpDir}/src/code/Common/BaseImporter.cpp ${assimpDir}/src/code/Common/BaseProcess.cpp ${assimpDir}/src/code/Common/BaseProcess.h ${assimpDir}/src/code/Common/Bitmap.cpp ${assimpDir}/src/code/Common/CreateAnimMesh.cpp + ${assimpDir}/src/code/Common/Compression.cpp ${assimpDir}/src/code/Common/Compression.h ${assimpDir}/src/code/Common/DefaultIOStream.cpp ${assimpDir}/src/code/Common/DefaultIOSystem.cpp ${assimpDir}/src/code/Common/DefaultLogger.cpp @@ -36,6 +38,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/Common/IFF.h ${assimpDir}/src/code/Common/Importer.cpp ${assimpDir}/src/code/Common/Importer.h ${assimpDir}/src/code/Common/ImporterRegistry.cpp + ${assimpDir}/src/code/Common/IOSystem.cpp ${assimpDir}/src/code/Common/PolyTools.h ${assimpDir}/src/code/Common/PostStepRegistry.cpp ${assimpDir}/src/code/Common/RemoveComments.cpp @@ -74,6 +77,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/FBX/FBXTokenizer.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXTokenizer.h ${assimpDir}/src/code/AssetLib/FBX/FBXUtil.cpp ${assimpDir}/src/code/AssetLib/FBX/FBXUtil.h ${assimpDir}/src/code/Material/MaterialSystem.cpp ${assimpDir}/src/code/Material/MaterialSystem.h + ${assimpDir}/src/code/Geometry/GeometryUtils.cpp ${assimpDir}/src/code/Geometry/GeometryUtils.h ${assimpDir}/src/code/AssetLib/Obj/ObjFileData.h ${assimpDir}/src/code/AssetLib/Obj/ObjFileImporter.cpp ${assimpDir}/src/code/AssetLib/Obj/ObjFileImporter.h ${assimpDir}/src/code/AssetLib/Obj/ObjFileMtlImporter.cpp ${assimpDir}/src/code/AssetLib/Obj/ObjFileMtlImporter.h @@ -117,7 +121,6 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/code/AssetLib/glTF2/glTF2Asset.h ${assimpDir}/src/code/AssetLib/glTF2/glTF2Asset.inl ${assimpDir}/src/code/AssetLib/glTF2/glTF2AssetWriter.h ${assimpDir}/src/code/AssetLib/glTF2/glTF2AssetWriter.inl ${assimpDir}/src/code/AssetLib/glTF2/glTF2Importer.cpp ${assimpDir}/src/code/AssetLib/glTF2/glTF2Importer.h - ${assimpDir}/src/contrib/pugixml/contrib/foreach.hpp ${assimpDir}/src/contrib/pugixml/src/pugixml.hpp ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.cc ${assimpDir}/src/contrib/poly2tri/poly2tri/common/shapes.h ${assimpDir}/src/contrib/poly2tri/poly2tri/common/utils.h @@ -139,7 +142,6 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/include/assimp/DefaultIOStream.h ${assimpDir}/src/include/assimp/DefaultIOSystem.h ${assimpDir}/src/include/assimp/DefaultLogger.hpp - ${assimpDir}/src/include/assimp/Defines.h ${assimpDir}/src/include/assimp/Exceptional.h ${assimpDir}/src/include/assimp/Exporter.hpp ${assimpDir}/src/include/assimp/GenericProperty.h @@ -221,6 +223,7 @@ function(qt3d_extend_target_for_assimp target) ASSIMP_BUILD_NO_EXPORT ASSIMP_BUILD_NO_HMP_IMPORTER ASSIMP_BUILD_NO_IFC_IMPORTER + ASSIMP_BUILD_NO_IQM_IMPORTER ASSIMP_BUILD_NO_IRRMESH_IMPORTER ASSIMP_BUILD_NO_IRR_IMPORTER ASSIMP_BUILD_NO_LIMITBONEWEIGHTS_PROCESS @@ -282,6 +285,7 @@ function(qt3d_extend_target_for_assimp target) ${assimpDir}/src/include ${assimpDir}/src/include/assimp/Compiler ${assimpDir}/unzip + NO_UNITY_BUILD ) qt_internal_extend_target(${target} CONDITION CMAKE_BUILD_TYPE STREQUAL Debug AND (CMAKE_CROSSCOMPILING OR NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp) @@ -304,6 +308,11 @@ function(qt3d_extend_target_for_assimp target) Qt::ZlibPrivate ) + qt_internal_extend_target(${target} CONDITION (EMSCRIPTEN OR ANDROID) AND NOT QT_FEATURE_qt3d_system_assimp + DEFINES + USE_FILE32API + ) + # special case begin qt_internal_extend_target(${target} CONDITION ICC AND NOT QT_FEATURE_qt3d_system_assimp AND (NOT CMAKE_CROSSCOMPILING OR NOT host_build) COMPILE_OPTIONS @@ -343,6 +352,13 @@ function(qt3d_extend_target_for_assimp target) /bigobj ) + qt_internal_extend_target(${target} CONDITION GCC AND (NOT QT_FEATURE_qt3d_system_assimp) AND (host_build OR NOT QT_FEATURE_qt3d_system_assimp) + SOURCES + ../../../3rdparty/assimp/src/code/Common/ZipArchiveIOSystem.cpp + COMPILE_OPTIONS + "-Wno-cast-function-type" + ) + # Silence warnings in 3rdparty code if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set_source_files_properties(${assimpDir}/src/code/AssetLib/Collada/ColladaParser.cpp PROPERTIES COMPILE_FLAGS "-Wno-strict-aliasing") |