diff options
| author | tamasmeszaros <meszaros.q@gmail.com> | 2019-12-11 15:59:17 +0300 |
|---|---|---|
| committer | tamasmeszaros <meszaros.q@gmail.com> | 2019-12-11 16:01:14 +0300 |
| commit | 4282c57069cfabb5735e5b9734c48b4bcbb9d51b (patch) | |
| tree | e1273890f141d9886782a7a83a0e1d06e7eaf6f6 /deps | |
| parent | 4a4d8b4e26e5b5405cb44970e832e9d22bc58ec4 (diff) | |
Fix zlib on msvc
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | deps/deps-unix-common.cmake | 1 | ||||
| -rw-r--r-- | deps/deps-windows.cmake | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/deps/CMakeLists.txt b/deps/CMakeLists.txt index d5c510853..9492936e1 100644 --- a/deps/CMakeLists.txt +++ b/deps/CMakeLists.txt @@ -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 debug build: ${DEP_DEBUG}") +find_package(Git REQUIRED) + + function(prusaslicer_add_cmake_project projectname) cmake_parse_arguments(P_ARGS "" "INSTALL_DIR;BUILD_COMMAND;INSTALL_COMMAND" "CMAKE_ARGS" ${ARGN}) @@ -137,7 +140,7 @@ if (MSVC) dep_cereal dep_nlopt # dep_qhull # Experimental - dep_zlib # on Windows we still need zlib + dep_ZLIB # on Windows we still need zlib dep_openvdb dep_OpenCSG ) diff --git a/deps/deps-unix-common.cmake b/deps/deps-unix-common.cmake index ad06ae77f..3f3a70c6a 100644 --- a/deps/deps-unix-common.cmake +++ b/deps/deps-unix-common.cmake @@ -54,7 +54,6 @@ ExternalProject_Add(dep_nlopt -DCMAKE_INSTALL_PREFIX=${DESTDIR}/usr/local ${DEP_CMAKE_OPTS} ) -find_package(Git REQUIRED) ExternalProject_Add(dep_qhull EXCLUDE_FROM_ALL 1 diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake index fc1823dc7..600168c1a 100644 --- a/deps/deps-windows.cmake +++ b/deps/deps-windows.cmake @@ -215,8 +215,6 @@ if (${DEP_DEBUG}) ) endif () -find_package(Git REQUIRED) - ExternalProject_Add(dep_qhull EXCLUDE_FROM_ALL 1 #URL "https://github.com/qhull/qhull/archive/v7.3.2.tar.gz" |