TorqueGameEngines/Torque3D
1
0
Fork 0
mirror of https://github.com/TorqueGameEngines/Torque3D.git synced 2026-07-16 00:54:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update assimp lib

Browse source
This commit is contained in:
marauder2k7 2024-12-09 20:22:47 +00:00
parent 03a348deb7
commit d3f8fee74e
1725 changed files with 196314 additions and 62009 deletions
Download patch file Download diff file Expand all files Collapse all files

42
Engine/lib/assimp/test/CMakeLists.txt
View file

@ -1,6 +1,6 @@
# Open Asset Import Library (assimp)
# ----------------------------------------------------------------------
# Copyright (c) 2006-2022, assimp team
# Copyright (c) 2006-2024, assimp team
#
# All rights reserved.
#
@ -45,8 +45,8 @@ INCLUDE_DIRECTORIES(
if(NOT ASSIMP_HUNTER_ENABLED)
INCLUDE_DIRECTORIES(
${Assimp_SOURCE_DIR}/contrib/gtest/include
${Assimp_SOURCE_DIR}/contrib/gtest/
${Assimp_SOURCE_DIR}/contrib/googletest/googletest/include
${Assimp_SOURCE_DIR}/contrib/googletest/googletest/
${Assimp_SOURCE_DIR}/contrib/pugixml/src
)
endif()
@ -100,6 +100,11 @@ SET( COMMON
unit/Common/utBase64.cpp
unit/Common/utHash.cpp
unit/Common/utBaseProcess.cpp
unit/Common/utLogger.cpp
)
SET(Geometry
unit/Geometry/utGeometryUtils.cpp
)
SET( IMPORTERS
@ -161,8 +166,15 @@ SET( IMPORTERS
unit/ImportExport/MDL/utMDLImporter_HL1_Nodes.cpp
unit/ImportExport/RAW/utRAWImportExport.cpp
unit/ImportExport/Terragen/utTerragenImportExport.cpp
unit/ImportExport/Pbrt/utPbrtImportExport.cpp
)
if(ASSIMP_BUILD_USD_IMPORTER)
list( APPEND IMPORTERS
unit/utUSDImport.cpp
)
endif()
SET( MATERIAL
unit/utMaterialSystem.cpp
)
@ -200,12 +212,13 @@ SET( POST_PROCESSES
unit/utGenBoundingBoxesProcess.cpp
)
SOURCE_GROUP( UnitTests\\Compiler FILES unit/CCompilerTest.c )
SOURCE_GROUP( UnitTests\\Common FILES ${COMMON} )
SOURCE_GROUP( UnitTests\\ImportExport FILES ${IMPORTERS} )
SOURCE_GROUP( UnitTests\\Material FILES ${MATERIAL} )
SOURCE_GROUP( UnitTests\\Math FILES ${MATH} )
SOURCE_GROUP( UnitTests\\PostProcess FILES ${POST_PROCESSES})
SOURCE_GROUP( UnitTests\\Compiler FILES unit/CCompilerTest.c )
SOURCE_GROUP( UnitTests\\Common FILES ${COMMON} )
SOURCE_GROUP( UnitTests\\GeometryTools FILES ${Geometry} )
SOURCE_GROUP( UnitTests\\ImportExport FILES ${IMPORTERS} )
SOURCE_GROUP( UnitTests\\Material FILES ${MATERIAL} )
SOURCE_GROUP( UnitTests\\Math FILES ${MATH} )
SOURCE_GROUP( UnitTests\\PostProcess FILES ${POST_PROCESSES})
add_executable( unit
unit/CCompilerTest.c
@ -213,6 +226,7 @@ add_executable( unit
../code/Common/Version.cpp
../code/Common/Base64.cpp
${COMMON}
${Geometry}
${IMPORTERS}
${MATERIAL}
${MATH}
@ -224,7 +238,7 @@ if(ASSIMP_HUNTER_ENABLED)
find_package(GTest CONFIG REQUIRED)
target_link_libraries(unit GTest::gtest_main GTest::gmock)
else()
target_sources(unit PUBLIC ${Assimp_SOURCE_DIR}/contrib/gtest/src/gtest-all.cc)
target_sources(unit PUBLIC ${Assimp_SOURCE_DIR}/contrib/googletest/googletest/src/gtest-all.cc)
endif()
# RapidJSON
@ -263,6 +277,14 @@ IF(MSVC)
add_definitions(-D_CRT_SECURE_NO_WARNINGS)
ENDIF()
IF (ASSIMP_WARNINGS_AS_ERRORS)
IF (MSVC)
TARGET_COMPILE_OPTIONS(unit PRIVATE /W4 /WX)
ELSE()
TARGET_COMPILE_OPTIONS(unit PRIVATE -Wall -Werror)
ENDIF()
ENDIF()
target_link_libraries( unit assimp ${platform_libs} )
add_subdirectory(headercheck)