File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -44,14 +44,6 @@ if(APPLE)
4444 "-DBUILD_SHARED_LIBS:BOOL=ON"
4545 )
4646endif ()
47- set (_windows_args)
48- set (_zlib_deps zlib)
49- if (WIN32 )
50- set (_windows_args
51- "-DITK_USE_SYSTEM_ZLIB:BOOL=OFF"
52- )
53- set (_zlib_deps )
54- endif ()
5547
5648ExternalProject_Add (ITK
5749 GIT_REPOSITORY "${git_protocol} ://github.com/InsightSoftwareConsortium/ITK.git"
@@ -68,17 +60,12 @@ ExternalProject_Add(ITK
6860 -DModule_ITKReview:BOOL=ON
6961 -DITK_LEGACY_SILENT:BOOL=ON
7062 -DExternalData_OBJECT_STORES:STRING=${ExternalData_OBJECT_STORES}
71- "-DITK_USE_SYSTEM_ZLIB:BOOL=ON"
72- "-DZLIB_ROOT:PATH=${ZLIB_ROOT} "
73- "-DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR} "
74- "-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY} "
7563 ${_vtk_args}
7664 ${_opencv_args}
7765 ${_wrap_python_args}
7866 ${_apple_args}
79- ${_windows_args}
8067 INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "ITK install skipped"
81- DEPENDS ${ITK_DEPENDENCIES} ${_python_depends} ${_zlib_deps}
68+ DEPENDS ${ITK_DEPENDENCIES} ${_python_depends}
8269 LOG_BUILD 0
8370)
8471
Original file line number Diff line number Diff line change @@ -24,14 +24,9 @@ ExternalProject_Add(VTK
2424 -DVTK_WRAP_PYTHON:BOOL=ON
2525 -DExternalData_OBJECT_STORES:STRING=${ExternalData_OBJECT_STORES}
2626 "-DPython3_EXECUTABLE:FILEPATH=${PYTHON_EXECUTABLE} "
27- -DVTK_USE_SYSTEM_ZLIB:BOOL=ON
28- "-DZLIB_ROOT:PATH=${ZLIB_ROOT} "
29- "-DZLIB_INCLUDE_DIR:PATH=${ZLIB_INCLUDE_DIR} "
30- "-DZLIB_LIBRARY:FILEPATH=${ZLIB_LIBRARY} "
3127 INSTALL_COMMAND ""
3228 LOG_DOWNLOAD 0
3329 LOG_UPDATE 0
34- DEPENDS zlib
3530)
3631
3732set (VTK_DIR ${CMAKE_BINARY_DIR} /VTK-build)
Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -32,10 +32,6 @@ set(ITKSphinxExamples_DEPENDENCIES )
3232set (ITK_DEPENDENCIES )
3333
3434option (ITKSphinxExamples_USE_VTK "Add VTK to the superbuild." OFF )
35- # Used by ITK, VTK, -- always build it.
36- if (NOT WIN32 OR ITKSphinxExamples_USE_VTK AND NOT VTK_DIR)
37- include (${CMAKE_SOURCE_DIR} /External-zlib.cmake )
38- endif ()
3935
4036option (ITKSphinxExamples_USE_OpenCV "Add OpenCV to the superbuild" OFF )
4137if (NOT OpenCV_DIR AND ITKSphinxExamples_USE_OpenCV)
You can’t perform that action at this time.
0 commit comments