From aca3eb52621e08efd01f03c4ffd86d9e6b4928b6 Mon Sep 17 00:00:00 2001
From: Francois Budin <francois.budin@kitware.com>
Date: Mon, 30 Apr 2018 10:02:11 -0400
Subject: Update VTK portfile to select RUNTIME install directories with CMake
 options

---
 ports/vtk/portfile.cmake | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'ports/vtk')

diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake
index be344f8bf..54246008a 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -165,6 +165,7 @@ vcpkg_configure_cmake(
         -DVTK_INSTALL_DATA_DIR=share/vtk/data
         -DVTK_INSTALL_DOC_DIR=share/vtk/doc
         -DVTK_INSTALL_PACKAGE_DIR=share/vtk
+        -DVTK_INSTALL_RUNTIME_DIR=tools
         -DVTK_FORBID_DOWNLOADS=ON
         ${ADDITIONAL_OPTIONS}
 )
@@ -294,15 +295,14 @@ string(REGEX REPLACE "${CURRENT_INSTALLED_DIR}/lib/[^\\.]*\\.lib" "" VTK_TARGETS
 file(WRITE "${CURRENT_PACKAGES_DIR}/share/vtk/VTKTargets.cmake" "${VTK_TARGETS_CONTENT}")
 
 # =============================================================================
-# Move executable to tools directory and clean-up other directories
-file(MAKE_DIRECTORY ${CURRENT_PACKAGES_DIR}/tools/vtk)
+# Clean-up other directories
 
-function(_vtk_move_tool TOOL_NAME)
-    if(EXISTS ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe)
-        file(RENAME ${CURRENT_PACKAGES_DIR}/bin/${TOOL_NAME}.exe ${CURRENT_PACKAGES_DIR}/tools/vtk/${TOOL_NAME}.exe)
-    endif()
 
-    file(REMOVE ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe)
+function(_vtk_remove_tool TOOL_NAME)
+    set(filename ${CURRENT_PACKAGES_DIR}/debug/bin/${TOOL_NAME}.exe)
+    if(EXISTS ${filename})
+        file(REMOVE ${filename})
+    endif()
 endfunction()
 
 set(VTK_TOOLS
@@ -326,7 +326,7 @@ 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}")
+    _vtk_remove_tool("${TOOL_NAME}")
 endforeach()
 
 # =============================================================================
-- 
cgit v1.2.3


From da53f7c8d614709ee66b9f55fb9ee8aed00416f1 Mon Sep 17 00:00:00 2001
From: Phil Christensen <philc@microsoft.com>
Date: Thu, 6 Dec 2018 17:32:05 -0800
Subject: [vtk] bump version in control file

---
 ports/vtk/CONTROL | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ports/vtk')

diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index d06f16331..01418b850 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 8.1.0-3
+Version: 8.1.0-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
 
-- 
cgit v1.2.3


From a6b12004c7b29353a68a142eaa7493ca997e05e7 Mon Sep 17 00:00:00 2001
From: Phil Christensen <philc@microsoft.com>
Date: Mon, 17 Dec 2018 12:09:44 -0800
Subject: [vtk] add warning for libx11_xt_lib on linux

---
 ports/vtk/CONTROL        | 2 +-
 ports/vtk/portfile.cmake | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'ports/vtk')

diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL
index 01418b850..0eb485dcd 100644
--- a/ports/vtk/CONTROL
+++ b/ports/vtk/CONTROL
@@ -1,5 +1,5 @@
 Source: vtk
-Version: 8.1.0-5
+Version: 8.1.0-6
 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/portfile.cmake b/ports/vtk/portfile.cmake
index 86616fd1f..7a5536163 100644
--- a/ports/vtk/portfile.cmake
+++ b/ports/vtk/portfile.cmake
@@ -1,3 +1,7 @@
+if(VCPKG_CMAKE_SYSTEM_NAME AND NOT VCPKG_CMAKE_SYSTEM_NAME STREQUAL "WindowsStore")
+    message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n")
+endif()
+
 include(vcpkg_common_functions)
 
 set(VTK_SHORT_VERSION "8.1")
-- 
cgit v1.2.3