Use older OpenSSL again

CesiumGS · Sep 13, 2024 · 8d4cabd · 8d4cabd
1 parent 92293be
commit 8d4cabd
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 11 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -486,7 +486,7 @@ endif()
 
 # Generate ThirdParty.json
 execute_process(COMMAND "${Python3_EXECUTABLE}" "${SCRIPTS_DIRECTORY}/generate_third_party_license_json.py" --build-dir
-                        "${PROJECT_BINARY_DIR}" --project-dir "${PROJECT_SOURCE_DIR}" --skip "doctest")
+                        "${PROJECT_BINARY_DIR}" --project-dir "${PROJECT_SOURCE_DIR}" --skip "doctest,strawberryperl")
 
 # Copy docs and related resources to exts folder.
 execute_process(COMMAND "${Python3_EXECUTABLE}" "${SCRIPTS_DIRECTORY}/copy_to_exts.py")

diff --git a/ThirdParty.json b/ThirdParty.json
@@ -33,12 +33,20 @@
         "version": "8.2.1",
         "url": "https://curl.se"
     },
+    {
+        "name": "nasm",
+        "license": [
+            "BSD-2-Clause"
+        ],
+        "version": "2.15.05",
+        "url": "http://www.nasm.us"
+    },
     {
         "name": "openssl",
         "license": [
-            "Apache-2.0"
+            "OpenSSL"
         ],
-        "version": "3.3.1",
+        "version": "1.1.1w",
         "url": "https://github.com/openssl/openssl"
     },
     {

diff --git a/cmake/AddConanDependencies.cmake b/cmake/AddConanDependencies.cmake
@@ -5,12 +5,17 @@ include(ConfigureConan)
 
 set(REQUIRES
     "doctest/2.4.9@#ea6440e3cd544c9a25bf3a96bcf16f48"
-    "openssl/3.3.1@#279e86dc2a7dded8c1fe8512e775bdb1"
+    "openssl/1.1.1w@#42c32b02f62aa987a58201f4c4561d3e"
     "pybind11/2.10.1@#561736204506dad955276aaab438aab4"
     "stb/cci.20220909@#1c47474f095ef8cd9e4959558525b827"
     "zlib/1.2.13@#13c96f538b52e1600c40b88994de240f"
     "yaml-cpp/0.7.0@#85b409c274a53d226b71f1bdb9cb4f8b"
-    "libcurl/8.2.1@#8f62ba7135f5445e5fe6c4bd85143b53")
+    "libcurl/8.2.1@#8f62ba7135f5445e5fe6c4bd85143b53"
+    "nasm/2.15.05@#799d63b1672a337584b09635b0f22fc1")
+
+if(WIN32)
+    set(REQUIRES ${REQUIRES} "strawberryperl/5.32.1.1@#8f83d05a60363a422f9033e52d106b47")
+endif()
 
 # cmake-format: off
 configure_conan(

diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt
@@ -96,8 +96,8 @@ if(MSVC)
         absl_bad_variant_access
         absl_raw_logging_internal
         absl_log_severity
-        libcrypto
         libssl
+        libcrypto
         spdlog
         fmt
         sqlite3
@@ -208,8 +208,8 @@ else()
         absl_bad_variant_access
         absl_raw_logging_internal
         absl_log_severity
-        crypto
         ssl
+        crypto
         spdlog
         fmt
         sqlite3

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -117,8 +117,9 @@ if(MSVC)
         absl_bad_variant_access
         absl_raw_logging_internal
         absl_log_severity
-        libcrypto
-        libssl
+        # Already linking OpenSSL from CURL (from Conan)
+        # libssl
+        # libcrypto
         spdlog
         fmt
         sqlite3
@@ -229,8 +230,9 @@ else()
         absl_bad_variant_access
         absl_raw_logging_internal
         absl_log_severity
-        crypto
-        ssl
+        # Already linking OpenSSL from CURL (from Conan)
+        #ssl
+        #crypto
         spdlog
         fmt
         sqlite3