add edits to build system for updated cesium-native

CesiumGS · Sep 1, 2024 · dbe6a0f · dbe6a0f
1 parent 9bd4a19
commit dbe6a0f
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -364,6 +364,7 @@ set(CESIUM_OMNI_CXX_DEFINES
     GLM_FORCE_XYZW_ONLY # Disable .rgba and .stpq to make it easier to view values from debugger
     GLM_FORCE_EXPLICIT_CTOR # Disallow implicit conversions between dvec3 <-> dvec4, dvec3 <-> fvec3, etc
     GLM_FORCE_SIZE_T_LENGTH # Make vec.length() and vec[idx] use size_t instead of int
+    GLM_ENABLE_EXPERIMENTAL
 )
 
 # Boost is a dependency of USD. It is dynamically linked so we need to set this flag.

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -20,15 +20,11 @@ add_external_project(
         CesiumAsync
         CesiumUtility
         async++
-        csprng
         draco
         ktx
-        modp_b64
-        s2geometry
         spdlog
         tinyxml2
         uriparser
-        webpdecoder
         turbojpeg
         meshoptimizer
         sqlite3
@@ -38,7 +34,6 @@ 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/extern/cesium-native b/extern/cesium-native
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -50,15 +50,11 @@ 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/bundled/format.h>
+#include <spdlog/fmt/fmt.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 {}", buildInfo.kitVersion)});
+        _headers.insert({"X-Cesium-Client-Engine", fmt::format("Kit SDK {}", std::string(buildInfo.kitVersion))});
         _headers.insert({"X-Cesium-Client-OS", platformInfo.platform});
     }