From ca67d880ec6003c27c63242cca8c9a668c3ddebe Mon Sep 17 00:00:00 2001 From: tamasmeszaros Date: Thu, 22 Jul 2021 12:38:50 +0200 Subject: [PATCH] Fix issues with finding new deps on win --- CMakeLists.txt | 3 +++ cmake/modules/FindOpenVDB.cmake | 2 +- src/libslic3r/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b8b9add60..268380dc2 100644 --- 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) diff --git a/cmake/modules/FindOpenVDB.cmake b/cmake/modules/FindOpenVDB.cmake index 3b60ac9d3..4fde5fa4a 100644 --- 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() diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt index bfe8427d0..83590d601 100644 --- 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)