Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/prusa3d/PrusaSlicer.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortamasmeszaros <meszaros.q@gmail.com>2019-11-18 11:35:26 +0300
committertamasmeszaros <meszaros.q@gmail.com>2019-11-18 11:35:26 +0300
commitab735bdc5445a77aa0fb69f22c4cd9565b382124 (patch)
treeeef84a9c1e00ab8b667f3a5aa2c79d2274a62096 /deps/deps-windows.cmake
parent7baefdf79dea3bb4ab88cb5ea324354bed5eacde (diff)
Follow up: fixing patches on windows
Diffstat (limited to 'deps/deps-windows.cmake')
-rw-r--r--deps/deps-windows.cmake5
1 files changed, 1 insertions, 4 deletions
diff --git a/deps/deps-windows.cmake b/deps/deps-windows.cmake
index 3affbaefa..1b978bdde 100644
--- a/deps/deps-windows.cmake
+++ b/deps/deps-windows.cmake
@@ -226,8 +226,6 @@ ExternalProject_Add(dep_qhull
-DBUILD_SHARED_LIBS=OFF
-DCMAKE_POSITION_INDEPENDENT_CODE=ON
-DCMAKE_DEBUG_POSTFIX=d
- PATCH_COMMAND PATCH_COMMAND ${GIT_EXECUTABLE} checkout -f -- . && git clean -df &&
- ${GIT_EXECUTABLE} apply --whitespace=fix ${CMAKE_CURRENT_SOURCE_DIR}/qhull-mods.patch
BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
INSTALL_COMMAND ""
)
@@ -311,7 +309,6 @@ ExternalProject_Add(dep_openexr
-DPYILMBASE_ENABLE:BOOL=OFF
-DOPENEXR_VIEWERS_ENABLE:BOOL=OFF
-DOPENEXR_BUILD_UTILS:BOOL=OFF
- UPDATE_COMMAND ""
BUILD_COMMAND msbuild /m /P:Configuration=Release INSTALL.vcxproj
INSTALL_COMMAND ""
)
@@ -324,7 +321,7 @@ ExternalProject_Add(dep_openvdb
#URL_HASH SHA256=dc337399dce8e1c9f21f20e97b1ce7e4933cb0a63bb3b8b734d8fcc464aa0c48
GIT_REPOSITORY https://github.com/AcademySoftwareFoundation/openvdb.git
GIT_TAG aebaf8d95be5e57fd33949281ec357db4a576c2e #v6.2.1
- DEPENDS dep_blosc dep_openexr #dep_tbb dep_boost
+ DEPENDS dep_blosc dep_openexr dep_tbb dep_boost
CMAKE_GENERATOR "${DEP_MSVC_GEN}"
CMAKE_GENERATOR_PLATFORM "${DEP_PLATFORM}"
CMAKE_ARGS