From 318613d2b230a306fb0c09ed1727cd66aeb60434 Mon Sep 17 00:00:00 2001
From: Robert Schumacher <roschuma@microsoft.com>
Date: Fri, 10 Nov 2017 01:23:10 -0800
Subject: [vtk] Refactor fixup to be less hacky. PCL builds for x86-windows.

---
 ports/vtk/CONTROL        | 2 +-
 ports/vtk/FindHDF5.cmake | 2 +-
 ports/vtk/portfile.cmake | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 0131e72bb..3919619ef 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 8.0.1-4
+Version: 8.0.1-5
 Description: Software system for 3D computer graphics, image processing, and visualization
 Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
 
diff --git a/ports/vtk/FindHDF5.cmake b/ports/vtk/FindHDF5.cmake
index b4783c947..4a8c4a166 100644
--- a/ports/vtk/FindHDF5.cmake
+++ b/ports/vtk/FindHDF5.cmake
@@ -20,7 +20,7 @@ else()
     message(FATAL_ERROR "could not find target hdf5_hl-*")
 endif()
 
-set(HDF5_LIBRARIES "$<BUILD_INTERFACE:$<$<NOT:$<STREQUAL:\${UNUSED_VARIABLE_NAME_GOES_HERE_VTK},>>:vtk::hdf5::hdf5>>" "$<BUILD_INTERFACE:$<$<NOT:$<STREQUAL:\${UNUSED_VARIABLE_NAME_GOES_HERE_VTK},>>:vtk::hdf5::hdf5_hl>>")
+set(HDF5_LIBRARIES "$<BUILD_INTERFACE:vtk::hdf5::hdf5>" "$<BUILD_INTERFACE:vtk::hdf5::hdf5_hl>")
 
 find_package_handle_standard_args(HDF5
     REQUIRED_VARS HDF5_INCLUDE_DIRS HDF5_LIBRARIES
diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index 1168691cc..f46b47cbf 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -320,6 +320,11 @@ set(VTK_TOOLS
     pvtkpython
 )
 
+file(READ "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" _contents)
+string(REPLACE "vtk::hdf5::hdf5_hl" "" _contents "${_contents}")
+string(REPLACE "vtk::hdf5::hdf5" "" _contents "${_contents}")
+file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/Modules/vtkhdf5.cmake" "${_contents}")
+
 foreach(TOOL_NAME IN LISTS VTK_TOOLS)
     _vtk_move_tool("${TOOL_NAME}")
 endforeach()
-- 
cgit v1.2.3