Skip to content

Commit d4973b3

Browse files
committed
try letting vtk use its own zlib as scirun's zlib is mangled somehow
1 parent 2c0d139 commit d4973b3

1 file changed

Lines changed: 6 additions & 8 deletions

File tree

Superbuild/VtkExternal.cmake

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,11 @@ SET_PROPERTY(DIRECTORY PROPERTY "EP_BASE" ${ep_base})
3030
set(vtk_GIT_TAG "v9.6.1")
3131

3232
# ---- Dependencies ----
33-
set(vtk_DEPENDENCIES "Zlib_external")
33+
#set(vtk_DEPENDENCIES "Zlib_external")
3434

3535
# ---- Pull dependency install dirs ----
36-
ExternalProject_Get_Property(Zlib_external INSTALL_DIR)
37-
set(ZLIB_INSTALL_DIR ${INSTALL_DIR})
36+
#ExternalProject_Get_Property(Zlib_external INSTALL_DIR)
37+
#set(ZLIB_INSTALL_DIR ${INSTALL_DIR})
3838

3939
# ---- ExternalProject ----
4040
ExternalProject_Add(VTK_external
@@ -60,16 +60,14 @@ ExternalProject_Add(VTK_external
6060
-DVTK_GROUP_ENABLE_IO:STRING=WANT
6161

6262
# ---- External dependency control ----
63-
-DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON
63+
#-DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON
6464

6565
# ---- Help VTK locate them (minimal first pass) ----
6666
# headers
67-
-DZLIB_INCLUDE_DIR:PATH=${ZLIB_SOURCE_DIR}
67+
#-DZLIB_INCLUDE_DIR:STRING=${ZLIB_SOURCE_DIR}\;${ZLIB_BINARY_DIR}
6868

6969
# library (platform-aware)
70-
-DZLIB_LIBRARY:FILEPATH=
71-
"$<$<PLATFORM_ID:Windows>:${ZLIB_BINARY_DIR}/$<CONFIG>/z.lib>
72-
$<$<NOT:$<PLATFORM_ID:Windows>>:${ZLIB_BINARY_DIR}/libz.a>"
70+
#-DZLIB_LIBRARY:FILEPATH=$<$<PLATFORM_ID:Windows>:${ZLIB_BINARY_DIR}/$<CONFIG>/z.lib>$<$<NOT:$<PLATFORM_ID:Windows>>:${ZLIB_BINARY_DIR}/libz.a>
7371

7472
# ---- Wrapping ----
7573
-DVTK_WRAP_PYTHON:BOOL=OFF

0 commit comments

Comments
 (0)