v4games
/
assimp
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable tinyusdz clone/build by default 

assimp github PR auto-CI checks clone/build the tinyusdz code, and reject PR
due to compiler warnings in the 3rd party external tinyusdz project
pull/5628/head
Steve M 2024-07-11 21:50:48 -07:00
parent b9d62a2744
commit 19d65dc924
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -41,6 +41,10 @@ SET(CMAKE_POLICY_DEFAULT_CMP0092 NEW)
CMAKE_MINIMUM_REQUIRED( VERSION 3.22 ) CMAKE_MINIMUM_REQUIRED( VERSION 3.22 )
# Experimental USD importer: disabled, need to opt-in # Experimental USD importer: disabled, need to opt-in
# Note: assimp github PR automatic checks will fail the PR due to compiler warnings in
# the external, 3rd party tinyusdz code which isn't technically part of the PR since it's
# auto-cloned during build; so MUST disable the feature or the PR will be rejected
option(ASSIMP_BUILD_USD_IMPORTER "Enable USD file import" off)
option(ASSIMP_BUILD_USD_VERBOSE_LOGS "Enable verbose USD import debug logging" off) option(ASSIMP_BUILD_USD_VERBOSE_LOGS "Enable verbose USD import debug logging" off)
# Disabled importers: m3d for 5.1 or later # Disabled importers: m3d for 5.1 or later

6
code/CMakeLists.txt
View File

@ -934,7 +934,7 @@ SOURCE_GROUP( Extra FILES ${Extra_SRCS})
# USD/USDA/USDC/USDZ support # USD/USDA/USDC/USDZ support
# tinyusdz # tinyusdz
IF (NOT ASSIMP_BUILD_NO_USD_IMPORTER) IF (ASSIMP_BUILD_USD_IMPORTER)
if (ASSIMP_BUILD_USD_VERBOSE_LOGS) if (ASSIMP_BUILD_USD_VERBOSE_LOGS)
ADD_DEFINITIONS( -DASSIMP_USD_VERBOSE_LOGS) ADD_DEFINITIONS( -DASSIMP_USD_VERBOSE_LOGS)
endif () endif ()
@ -1043,11 +1043,11 @@ IF (NOT ASSIMP_BUILD_NO_USD_IMPORTER)
${Tinyusdz_DEP_SOURCES} ${Tinyusdz_DEP_SOURCES}
) )
MESSAGE(STATUS "tinyusdz enabled") MESSAGE(STATUS "tinyusdz enabled")
ELSE() ELSE() # IF (ASSIMP_BUILD_USD_IMPORTER)
set(Tinyusdz_SRCS "") set(Tinyusdz_SRCS "")
set(Tinyusdz_DEP_SOURCES "") set(Tinyusdz_DEP_SOURCES "")
MESSAGE(STATUS "tinyusdz disabled") MESSAGE(STATUS "tinyusdz disabled")
ENDIF() ENDIF() # IF (ASSIMP_BUILD_USD_IMPORTER)
# pugixml # pugixml
IF(ASSIMP_HUNTER_ENABLED) IF(ASSIMP_HUNTER_ENABLED)