diff --git a/Cesium3DTilesContent/src/B3dmToGltfConverter.cpp b/Cesium3DTilesContent/src/B3dmToGltfConverter.cpp index 629679633..ebc678883 100644 --- a/Cesium3DTilesContent/src/B3dmToGltfConverter.cpp +++ b/Cesium3DTilesContent/src/B3dmToGltfConverter.cpp @@ -153,7 +153,7 @@ rapidjson::Document parseFeatureTableJsonData( result.errors.emplaceError(fmt::format( "Error when parsing feature table JSON, error code {} at byte offset " "{}", - document.GetParseError(), + (int)document.GetParseError(), document.GetErrorOffset())); return document; } diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 1cabdbdfa..260a9d157 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -66,9 +66,11 @@ target_include_directories( add_subdirectory(asyncplusplus) -set(SPDLOG_BUILD_TESTING OFF CACHE INTERNAL "Disable SPDLOG Testing") -add_subdirectory(spdlog) -target_compile_definitions(spdlog PUBLIC _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) +if (NOT TARGET spdlog::spdlog) + set(SPDLOG_BUILD_TESTING OFF CACHE INTERNAL "Disable SPDLOG Testing") + add_subdirectory(spdlog) + target_compile_definitions(spdlog PUBLIC _SILENCE_STDEXT_ARR_ITERS_DEPRECATION_WARNING) +endif() if (NOT TARGET sqlite3) add_subdirectory(sqlite3)