File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -63,7 +63,13 @@ ExternalProject_Add(VTK_external
6363 -DVTK_MODULE_USE_EXTERNAL_VTK_zlib:BOOL=ON
6464
6565 # ---- Help VTK locate them (minimal first pass) ----
66- -DZLIB_ROOT=${ZLIB_INSTALL_DIR}
66+ # headers
67+ -DZLIB_INCLUDE_DIR:PATH=${ZLIB_SOURCE_DIR}
68+
69+ # 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 >"
6773
6874 # ---- Wrapping ----
6975 -DVTK_WRAP_PYTHON:BOOL=OFF
Original file line number Diff line number Diff line change @@ -33,13 +33,7 @@ ExternalProject_Add(Zlib_external
3333 GIT_REPOSITORY "https://github.com/CIBC-Internal/zlib.git"
3434 GIT_TAG ${zlib_GIT_TAG}
3535
36- INSTALL_DIR ${ep_base} /Install/zlib
37-
38- INSTALL_COMMAND
39- ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR >/lib
40- COMMAND ${CMAKE_COMMAND} -E make_directory <INSTALL_DIR >/include
41- COMMAND ${CMAKE_COMMAND} -E copy <BINARY_DIR >/Release/zlib.lib <INSTALL_DIR >/lib
42- COMMAND ${CMAKE_COMMAND} -E copy <SOURCE_DIR >/zlib.h <INSTALL_DIR >/include
36+ INSTALL_COMMAND ""
4337
4438 CMAKE_CACHE_ARGS
4539 -DCMAKE_VERBOSE_MAKEFILE:BOOL=${CMAKE_VERBOSE_MAKEFILE}
@@ -48,6 +42,10 @@ ExternalProject_Add(Zlib_external
4842)
4943
5044ExternalProject_Get_Property (Zlib_external BINARY_DIR )
45+ ExternalProject_Get_Property (Zlib_external SOURCE_DIR )
46+
5147SET (Zlib_DIR ${BINARY_DIR} CACHE PATH "" )
48+ set (ZLIB_BINARY_DIR ${BINARY_DIR} )
49+ set (ZLIB_SOURCE_DIR ${SOURCE_DIR} )
5250
5351MESSAGE (STATUS "Zlib_DIR: ${Zlib_DIR} " )
You can’t perform that action at this time.
0 commit comments