Do not include internal spdlog if it is already provided.

Klebert-Engineering · Feb 21, 2024 · 684fecc · 684fecc
1 parent 09c1eb7
commit 684fecc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git 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
@@ -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)