3D-printing/OrcaSlicer
1
0
Fork 0
mirror of https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-07 22:14:00 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

upgrade deps (#2349)

Browse source 
* upgrade deps
This commit is contained in:
SoftFever 2023-10-09 00:19:26 +08:00 • committed by GitHub
parent 9dd3fb60b7
commit 6962cd6577
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 63 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

7
deps/CURL/CURL.cmake vendored
View file

@ -25,7 +25,8 @@ set(_curl_platform_flags
)
if (WIN32)
set(_curl_platform_flags ${_curl_platform_flags} -DCMAKE_USE_SCHANNEL=ON)
#set(_curl_platform_flags ${_curl_platform_flags} -DCMAKE_USE_SCHANNEL=ON)
set(_curl_platform_flags ${_curl_platform_flags} -DCMAKE_USE_OPENSSL=ON -DCURL_CA_PATH:STRING=none)
elseif (APPLE)
set(_curl_platform_flags
@ -71,9 +72,9 @@ orcaslicer_add_cmake_project(CURL
${_curl_platform_flags}
)
if (APPLE OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
# if (APPLE OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
add_dependencies(dep_CURL dep_OpenSSL)
endif ()
# endif ()
if (MSVC)
add_debug_dep(dep_CURL)

8
deps/OpenSSL/OpenSSL.cmake vendored
View file

@ -40,10 +40,10 @@ endif()
ExternalProject_Add(dep_OpenSSL
#EXCLUDE_FROM_ALL ON
#URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1k.tar.gz"
URL "https://github.com/openssl/openssl/archive/refs/tags/openssl-3.1.2.tar.gz"
#URL_HASH SHA256=b92f9d3d12043c02860e5e602e50a73ed21a69947bcc74d391f41148e9f6aa95
URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31
URL "https://github.com/openssl/openssl/archive/OpenSSL_1_1_1w.tar.gz"
URL_HASH SHA256=2130E8C2FB3B79D1086186F78E59E8BC8D1A6AEDF17AB3907F4CB9AE20918C41
# URL "https://github.com/openssl/openssl/archive/refs/tags/openssl-3.1.2.tar.gz"
# URL_HASH SHA256=8c776993154652d0bb393f506d850b811517c8bd8d24b1008aef57fbe55d3f31
DOWNLOAD_DIR ${DEP_DOWNLOAD_DIR}/OpenSSL
CONFIGURE_COMMAND ${_conf_cmd} ${_cross_arch}
"--openssldir=${DESTDIR}/usr/local"