Fix issues with finding new deps on win

2021-07-22 12:38:50 +02:00 · 2021-07-22 12:38:50 +02:00 · ca67d880ec
commit ca67d880ec
parent 7ed0d6b886
3 changed files with 5 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -389,10 +389,13 @@ find_package(CURL REQUIRED)
 add_library(libcurl INTERFACE)
 target_link_libraries(libcurl INTERFACE CURL::libcurl)

+# Fixing curl's cmake config script bugs
 if (NOT WIN32)
    # Required by libcurl
    find_package(ZLIB REQUIRED)
    target_link_libraries(libcurl INTERFACE ZLIB::ZLIB)
+else()
+    target_link_libraries(libcurl INTERFACE crypt32)
 endif()

 if (SLIC3R_STATIC)
--- a/cmake/modules/FindOpenVDB.cmake
+++ b/cmake/modules/FindOpenVDB.cmake
@ -347,7 +347,7 @@ macro(just_fail msg)
  return()
 endmacro()

-find_package(IlmBase QUIET COMPONENTS Half)
+find_package(IlmBase QUIET)
 if(NOT IlmBase_FOUND)
  pkg_check_modules(IlmBase QUIET IlmBase)
 endif()
--- a/src/libslic3r/CMakeLists.txt
+++ b/src/libslic3r/CMakeLists.txt
@ -1,5 +1,5 @@
-project(libslic3r)
 cmake_minimum_required(VERSION 3.13)
+project(libslic3r)

 include(PrecompiledHeader)