fix

SoftFever · Oct 7, 2023 · a313406 · a313406
1 parent 337e5d0
commit a313406
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml
@@ -60,6 +60,7 @@ jobs:
  choco install strawberryperl
  mkdir ${{ github.workspace }}/deps/build
  mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
+ $env:SHELL = "X:PATHCOMMAND.COM /P /E:1024"
  .\build_release_vs2022.bat deps
  cd ${{ github.workspace }}/deps/build
 

diff --git a/build_release_vs2022.bat b/build_release_vs2022.bat
@@ -8,7 +8,8 @@ if "%1"=="slicer" (
 )
 echo "building deps.."
 cmake ../ -G "Visual Studio 17 2022" -A x64 -DDESTDIR="%CD%/OrcaSlicer_dep" -DCMAKE_BUILD_TYPE=Release
-cmake --build . --config Release --target deps -- -m
+msbuild .\deps.vcxproj -property:Configuration=Release
+@REM msbuild .\dep_OpenSSL.vcxproj
 
 if "%1"=="deps" exit /b 0
 

diff --git a/deps/CURL/CURL.cmake b/deps/CURL/CURL.cmake
@@ -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,7 @@ orcaslicer_add_cmake_project(CURL
  ${_curl_platform_flags}
 )
 
-if (APPLE OR (CMAKE_SYSTEM_NAME STREQUAL "Linux"))
- add_dependencies(dep_CURL dep_OpenSSL)
-endif ()
+add_dependencies(dep_CURL dep_OpenSSL)
 
 if (MSVC)
  add_debug_dep(dep_CURL)