3DPrinting/PrusaSlicer-NonPlainar
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix issues with finding new deps on win

Browse source
This commit is contained in:
tamasmeszaros 2021-07-22 12:38:50 +02:00
parent 7ed0d6b886
commit ca67d880ec
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
CMakeLists.txt
View file

@ -389,10 +389,13 @@ find_package(CURL REQUIRED)
add_library(libcurl INTERFACE) add_library(libcurl INTERFACE)
target_link_libraries(libcurl INTERFACE CURL::libcurl) target_link_libraries(libcurl INTERFACE CURL::libcurl)
# Fixing curl's cmake config script bugs
if (NOT WIN32) if (NOT WIN32)
# Required by libcurl # Required by libcurl
find_package(ZLIB REQUIRED) find_package(ZLIB REQUIRED)
target_link_libraries(libcurl INTERFACE ZLIB::ZLIB) target_link_libraries(libcurl INTERFACE ZLIB::ZLIB)
else()
target_link_libraries(libcurl INTERFACE crypt32)
endif() endif()
if (SLIC3R_STATIC) if (SLIC3R_STATIC)

2
cmake/modules/FindOpenVDB.cmake
View file

@ -347,7 +347,7 @@ macro(just_fail msg)
return() return()
endmacro() endmacro()
find_package(IlmBase QUIET COMPONENTS Half) find_package(IlmBase QUIET)
if(NOT IlmBase_FOUND) if(NOT IlmBase_FOUND)
pkg_check_modules(IlmBase QUIET IlmBase) pkg_check_modules(IlmBase QUIET IlmBase)
endif() endif()

2
src/libslic3r/CMakeLists.txt
View file

@ -1,5 +1,5 @@
project(libslic3r)
cmake_minimum_required(VERSION 3.13) cmake_minimum_required(VERSION 3.13)
project(libslic3r)
include(PrecompiledHeader) include(PrecompiledHeader)