roll back files

CesiumGS · Sep 4, 2024 · 6ac5001 · 6ac5001
1 parent 05a0721
commit 6ac5001
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 2 deletions.
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -20,11 +20,15 @@ add_external_project(
         CesiumAsync
         CesiumUtility
         async++
+        csprng
         draco
         ktx
+        modp_b64
+        s2geometry
         spdlog
         tinyxml2
         uriparser
+        webpdecoder
         turbojpeg
         meshoptimizer
         sqlite3
@@ -34,6 +38,7 @@ add_external_project(
         CESIUM_TRACING_ENABLED=${CESIUM_OMNI_ENABLE_TRACING}
     PROJECT_EXTERN_DIRECTORY
         "${PROJECT_SOURCE_DIR}/extern"
+    EXPECTED_DEBUG_POSTFIX "d"
 )
 # cmake-format: on
 

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -50,11 +50,15 @@ setup_lib(
         CesiumAsync
         CesiumUtility
         async++
+        csprng
         draco
         ktx
+        modp_b64
+        s2geometry
         spdlog
         tinyxml2
         uriparser
+        webpdecoder
         turbojpeg
         meshoptimizer
         sqlite3

diff --git a/src/core/src/SettingsWrapper.cpp b/src/core/src/SettingsWrapper.cpp
@@ -2,7 +2,7 @@
 
 #include <carb/InterfaceUtils.h>
 #include <carb/settings/ISettings.h>
-#include <spdlog/fmt/fmt.h>
+#include <spdlog/fmt/bundled/format.h>
 
 namespace cesium::omniverse::Settings {
 

diff --git a/src/core/src/UrlAssetAccessor.cpp b/src/core/src/UrlAssetAccessor.cpp
@@ -85,7 +85,7 @@ class UrlAssetRequest final : public CesiumAsync::IAssetRequest {
         _headers.insert({"X-Cesium-Client", "Cesium for Omniverse"});
         _headers.insert(
             {"X-Cesium-Client-Version", fmt::format("v{} {}", CESIUM_OMNI_VERSION, CESIUM_OMNI_GIT_HASH_ABBREVIATED)});
-        _headers.insert({"X-Cesium-Client-Engine", fmt::format("Kit SDK {}", std::string(buildInfo.kitVersion))});
+        _headers.insert({"X-Cesium-Client-Engine", fmt::format("Kit SDK {}", buildInfo.kitVersion)});
         _headers.insert({"X-Cesium-Client-OS", platformInfo.platform});
     }