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

Fix zlib on msvc

Browse Source
This commit is contained in:
tamasmeszaros 2019-12-11 13:59:17 +01:00
parent 4a4d8b4e26
commit 4282c57069
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/CMakeLists.txt vendored
View File

@ -45,6 +45,9 @@ option(DEP_WX_STABLE "Build against wxWidgets stable 3.0 as opposed to default 3
message(STATUS "PrusaSlicer deps DESTDIR: ${DESTDIR}") message(STATUS "PrusaSlicer deps DESTDIR: ${DESTDIR}")
message(STATUS "PrusaSlicer deps debug build: ${DEP_DEBUG}") message(STATUS "PrusaSlicer deps debug build: ${DEP_DEBUG}")
find_package(Git REQUIRED)
function(prusaslicer_add_cmake_project projectname) function(prusaslicer_add_cmake_project projectname)
cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN})
@ -137,7 +140,7 @@ if (MSVC)
dep_cereal dep_cereal
dep_nlopt dep_nlopt
# dep_qhull # Experimental # dep_qhull # Experimental
dep_zlib # on Windows we still need zlib dep_ZLIB # on Windows we still need zlib
dep_openvdb dep_openvdb
dep_OpenCSG dep_OpenCSG
) )

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

@ -54,7 +54,6 @@ ExternalProject_Add(dep_nlopt
-DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local
${DEP_CMAKE_OPTS} ${DEP_CMAKE_OPTS}
) )
find_package(Git REQUIRED)
ExternalProject_Add(dep_qhull ExternalProject_Add(dep_qhull
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1

2
deps/deps-windows.cmake vendored
View File

@ -215,8 +215,6 @@ if (${DEP_DEBUG})
) )
endif () endif ()
find_package(Git REQUIRED)
ExternalProject_Add(dep_qhull ExternalProject_Add(dep_qhull
EXCLUDE_FROM_ALL 1 EXCLUDE_FROM_ALL 1
#URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz" #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz"