diff --git a/CMakeLists.txt b/CMakeLists.txt index b698d75f9..9de0fc0ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -696,9 +696,6 @@ ELSE() ENDIF() ENDIF() -# USD/USDA/USDC/USDZ support -option(ASSIMP_TINYUSDZ_ENABLED "Enable tinyusdz support" OFF) - # Main assimp code ADD_SUBDIRECTORY( code/ ) diff --git a/code/CMakeLists.txt b/code/CMakeLists.txt index d0360f1db..8f91ff3dd 100644 --- a/code/CMakeLists.txt +++ b/code/CMakeLists.txt @@ -916,7 +916,7 @@ SOURCE_GROUP( Extra FILES ${Extra_SRCS}) # USD/USDA/USDC/USDZ support # tinyusdz -IF(ASSIMP_TINYUSDZ_ENABLED) +IF (NOT ASSIMP_BUILD_NO_USD_IMPORTER) set(Tinyusdz_SRC_RELPATH "../contrib/tinyusdz/tinyusdz_repo/src") set(Tinyusdz_SRCS ${Tinyusdz_SRC_RELPATH}/ascii-parser.cc