File tree Expand file tree Collapse file tree 4 files changed +1
-46
lines changed Expand file tree Collapse file tree 4 files changed +1
-46
lines changed Original file line number Diff line number Diff line change @@ -44,14 +44,6 @@ if(APPLE)
44
44
"-DBUILD_SHARED_LIBS:BOOL=ON"
45
45
)
46
46
endif ()
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 ()
55
47
56
48
ExternalProject_Add (ITK
57
49
GIT_REPOSITORY "${git_protocol} ://github.com/InsightSoftwareConsortium/ITK.git"
@@ -68,17 +60,12 @@ ExternalProject_Add(ITK
68
60
-DModule_ITKReview:BOOL=ON
69
61
-DITK_LEGACY_SILENT:BOOL=ON
70
62
-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} "
75
63
${_vtk_args}
76
64
${_opencv_args}
77
65
${_wrap_python_args}
78
66
${_apple_args}
79
- ${_windows_args}
80
67
INSTALL_COMMAND ${CMAKE_COMMAND} -E echo "ITK install skipped"
81
- DEPENDS ${ITK_DEPENDENCIES} ${_python_depends} ${_zlib_deps}
68
+ DEPENDS ${ITK_DEPENDENCIES} ${_python_depends}
82
69
LOG_BUILD 0
83
70
)
84
71
Original file line number Diff line number Diff line change @@ -24,14 +24,9 @@ ExternalProject_Add(VTK
24
24
-DVTK_WRAP_PYTHON:BOOL=ON
25
25
-DExternalData_OBJECT_STORES:STRING=${ExternalData_OBJECT_STORES}
26
26
"-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} "
31
27
INSTALL_COMMAND ""
32
28
LOG_DOWNLOAD 0
33
29
LOG_UPDATE 0
34
- DEPENDS zlib
35
30
)
36
31
37
32
set (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 )
32
32
set (ITK_DEPENDENCIES )
33
33
34
34
option (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 ()
39
35
40
36
option (ITKSphinxExamples_USE_OpenCV "Add OpenCV to the superbuild" OFF )
41
37
if (NOT OpenCV_DIR AND ITKSphinxExamples_USE_OpenCV )
You can’t perform that action at this time.
0 commit comments