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

Add explicit ZLIB system package requirement on Unix systems.

Browse Source 
We already depended on that but is wasn't stated in the deps script.
This commit is contained in:
tamasmeszaros 2019-10-30 18:08:16 +01:00
parent 64a5696539
commit ce9c2c5dd4
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deps/deps-unix-common.cmake vendored
View File

@ -7,6 +7,8 @@ else ()
set(TBB_MINGW_WORKAROUND "") set(TBB_MINGW_WORKAROUND "")
endif () endif ()
find_package(ZLIB REQUIRED)
ExternalProject_Add(dep_tbb ExternalProject_Add(dep_tbb
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
URL "https://github.com/wjakob/tbb/archive/a0dc9bf76d0120f917b641ed095360448cabc85b.tar.gz" URL "https://github.com/wjakob/tbb/archive/a0dc9bf76d0120f917b641ed095360448cabc85b.tar.gz"
@ -105,7 +107,7 @@ ExternalProject_Add(dep_blosc
-DBUILD_STATIC=ON -DBUILD_STATIC=ON
-DBUILD_TESTS=OFF -DBUILD_TESTS=OFF
-DBUILD_BENCHMARKS=OFF -DBUILD_BENCHMARKS=OFF
-DPREFER_EXTERNAL_ZLIB=OFF -DPREFER_EXTERNAL_ZLIB=ON
PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch PATCH_COMMAND ${GIT_EXECUTABLE} apply --ignore-space-change --ignore-whitespace ${CMAKE_CURRENT_SOURCE_DIR}/blosc-mods.patch
) )

2
deps/deps-windows.cmake vendored
View File

@ -333,7 +333,7 @@ ExternalProject_Add(dep_openexr
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
GIT_REPOSITORY https://github.com/openexr/openexr.git GIT_REPOSITORY https://github.com/openexr/openexr.git
GIT_TAG v2.4.0 GIT_TAG v2.4.0
DEPENDS DEPENDS dep_zlib
CMAKE_GENERATOR "${DEP_MSVC_GEN}" CMAKE_GENERATOR "${DEP_MSVC_GEN}"
CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}" CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
CMAKE_ARGS CMAKE_ARGS