Merge branch 'main' into curl-reserve

CesiumGS · Oct 20, 2023 · 3d8ce69 · 3d8ce69
2 parents 3f09e67 + ec90c2c
commit 3d8ce69
Show file tree

Hide file tree

Showing 24 changed files with 1,704 additions and 371 deletions.
diff --git a/ThirdParty.extra.json b/ThirdParty.extra.json
@@ -7,6 +7,15 @@
         "version": "0.15.0",
         "url": "https://github.com/CesiumGS/cesium-native"
     },
+    {
+        "name": "cmake-conan",
+        "license": [
+            "MIT"
+        ],
+        "notes": "conan.cmake was downloaded to work around an SSL issue, see https://github.com/conan-io/cmake-conan/issues/575",
+        "version": "0.17.0",
+        "url": "https://github.com/conan-io/cmake-conan"
+    },
     {
         "name": "glTF-Asset-Generator",
         "license": [

diff --git a/ThirdParty.json b/ThirdParty.json
@@ -7,6 +7,15 @@
         "version": "0.15.0",
         "url": "https://github.com/CesiumGS/cesium-native"
     },
+    {
+        "name": "cmake-conan",
+        "license": [
+            "MIT"
+        ],
+        "notes": "conan.cmake was downloaded to work around an SSL issue, see https://github.com/conan-io/cmake-conan/issues/575",
+        "version": "0.17.0",
+        "url": "https://github.com/conan-io/cmake-conan"
+    },
     {
         "name": "cpr",
         "license": [

diff --git a/apps/cesium.omniverse.dev.kit b/apps/cesium.omniverse.dev.kit
@@ -14,7 +14,7 @@ app = true
 
 [settings]
 app.window.title = "Cesium for Omniverse Testing App"
-app.useFabricSceneDelegate = true
+app.useFabricSceneDelegate = false
 app.usdrt.scene_delegate.enableProxyCubes = false
 app.usdrt.scene_delegate.geometryStreaming.enabled = false
 omnihydra.parallelHydraSprimSync = false

diff --git a/cmake/ConfigureConan.cmake b/cmake/ConfigureConan.cmake
@@ -16,16 +16,12 @@ macro(configure_conan)
         message(FATAL_ERROR "REQUIRES was not specified")
     endif()
 
-    if(NOT EXISTS "${_PROJECT_BUILD_DIRECTORY}/conan.cmake")
-        message(STATUS "Downloading conan.cmake from https://github.com/conan-io/cmake-conan")
-        file(
-            DOWNLOAD "https://raw.githubusercontent.com/conan-io/cmake-conan/0.17.0/conan.cmake"
-            "${_PROJECT_BUILD_DIRECTORY}/conan.cmake"
-            EXPECTED_HASH SHA256=3bef79da16c2e031dc429e1dac87a08b9226418b300ce004cc125a82687baeef
-            TLS_VERIFY ON)
+    if(NOT EXISTS "${_PROJECT_BUILD_DIRECTORY}/conan-0.17.0.cmake")
+        message(STATUS "Copying Conan 0.17.0 into build folder")
+        file(COPY "${CMAKE_MODULE_PATH}/conan-0.17.0.cmake" DESTINATION "${_PROJECT_BUILD_DIRECTORY}")
     endif()
 
-    include("${_PROJECT_BUILD_DIRECTORY}/conan.cmake")
+    include("${_PROJECT_BUILD_DIRECTORY}/conan-0.17.0.cmake")
 
     # Execute conan config init to ensure ~/.conan/settings.yml exists
     find_program(CONAN_CMD_PATH conan)