mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-30 12:11:15 -06:00
Revert "Merge branch 'SoftFever' into feature/calib"
This reverts commitf5b28201fe, reversing changes made tod9e9fb2206. # Conflicts: # version.inc
This commit is contained in:
parent
de33c24b0a
commit
a688719e72
53 changed files with 1228 additions and 498 deletions
3
deps/CURL/CURL.cmake
vendored
3
deps/CURL/CURL.cmake
vendored
|
|
@ -25,8 +25,7 @@ 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_OPENSSL=ON -DCURL_CA_PATH:STRING=none)
|
||||
set(_curl_platform_flags ${_curl_platform_flags} -DCMAKE_USE_SCHANNEL=ON)
|
||||
elseif (APPLE)
|
||||
set(_curl_platform_flags
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue