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

Add verbose logging cmake option

pull/5628/head
Steve M 2024-07-11 18:09:59 -07:00
parent 3496284824
commit c7374336af
3 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -40,6 +40,9 @@ 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
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
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_IMPORTER) ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_IMPORTER)
ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_EXPORTER) ADD_DEFINITIONS( -DASSIMP_BUILD_NO_M3D_EXPORTER)

3
code/CMakeLists.txt
View File

@ -935,6 +935,9 @@ 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 (NOT ASSIMP_BUILD_NO_USD_IMPORTER)
if (ASSIMP_BUILD_USD_VERBOSE_LOGS)
ADD_DEFINITIONS( -DASSIMP_USD_VERBOSE_LOGS)
endif ()
# Use CMAKE_CURRENT_SOURCE_DIR which provides assimp-local path (CMAKE_SOURCE_DIR is # Use CMAKE_CURRENT_SOURCE_DIR which provides assimp-local path (CMAKE_SOURCE_DIR is
# relative to top-level/main project) # relative to top-level/main project)
set(Tinyusdz_BASE_ABSPATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/tinyusdz") set(Tinyusdz_BASE_ABSPATH "${CMAKE_CURRENT_SOURCE_DIR}/../contrib/tinyusdz")

17
contrib/tinyusdz/assimp_tinyusdz_logging.inc
View File

@ -29,6 +29,7 @@
#if defined(TINYUSDZ_LOCAL_DEBUG_PRINT) #if defined(TINYUSDZ_LOCAL_DEBUG_PRINT)
#if defined(__ANDROID__) #if defined(__ANDROID__)
#if defined(ASSIMP_USD_VERBOSE_LOGS)
// Works well but _extremely_ verbose // Works well but _extremely_ verbose
#define DCOUT(x) \ #define DCOUT(x) \
do { \ do { \
@ -37,14 +38,16 @@
<< std::to_string(__LINE__) << " " << x << "\n"; \ << std::to_string(__LINE__) << " " << x << "\n"; \
TINYUSDZLOGE("tinyusdz", "%s", ss.str().c_str()); \ TINYUSDZLOGE("tinyusdz", "%s", ss.str().c_str()); \
} while (false) } while (false)
#else // defined(ASSIMP_USD_VERBOSE_LOGS)
// Silent version // Silent version
//#define DCOUT(x) \ #define DCOUT(x) \
// do { \ do { \
// std::stringstream ss; \ std::stringstream ss; \
// ss << __FILE__ << ":" << __func__ << ":" \ ss << __FILE__ << ":" << __func__ << ":" \
// << std::to_string(__LINE__) << " " << x << "\n"; \ << std::to_string(__LINE__) << " " << x << "\n"; \
// } while (false) } while (false)
#else #endif // defined(ASSIMP_USD_VERBOSE_LOGS)
#else // defined(__ANDROID__)
#define DCOUT(x) \ #define DCOUT(x) \
do { \ do { \
std::cout << __FILE__ << ":" << __func__ << ":" \ std::cout << __FILE__ << ":" << __func__ << ":" \