diff options
| author | Victor Romero <romerosanchezv@gmail.com> | 2020-01-13 11:49:15 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-13 11:49:15 -0800 |
| commit | 9a510168c7102722fac448c0fe3c630d303e5d6e (patch) | |
| tree | dc1940519111b00f8015c199a90cc43f7c4084ab /ports/vtk | |
| parent | e46a029bf727fa3347f1caec2dc26cef43ec3ac6 (diff) | |
| parent | ecf83936b291ca2a28f36d8e39d5b191f4b2b193 (diff) | |
| download | vcpkg-9a510168c7102722fac448c0fe3c630d303e5d6e.tar.gz vcpkg-9a510168c7102722fac448c0fe3c630d303e5d6e.zip | |
Merge branch 'master' into dev/jack/update_osx_baseline
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/fix-VTKConfig-cmake.patch | 29 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
2 files changed, 30 insertions, 0 deletions
diff --git a/ports/vtk/fix-VTKConfig-cmake.patch b/ports/vtk/fix-VTKConfig-cmake.patch new file mode 100644 index 000000000..a507d22a8 --- /dev/null +++ b/ports/vtk/fix-VTKConfig-cmake.patch @@ -0,0 +1,29 @@ +diff --git a/CMake/VTKConfig.cmake.in b/CMake/VTKConfig.cmake.in +index 13e4db42..d28e0cc2 100644 +--- a/CMake/VTKConfig.cmake.in ++++ b/CMake/VTKConfig.cmake.in +@@ -66,19 +66,11 @@ set(VTK_USE_FILE "${VTK_CMAKE_DIR}/UseVTK.cmake") + # The rendering backend VTK was configured to use. + set(VTK_RENDERING_BACKEND "@VTK_RENDERING_BACKEND@") + +-if (__vtk_install_tree) +- if (WIN32) +- set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_RUNTIME_DIR@") +- else () +- set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_LIBRARY_DIR@") +- endif () +-else() +- if (WIN32) +- set (VTK_RUNTIME_DIRS "@CMAKE_BINARY_DIR@/bin") +- else () +- set (VTK_RUNTIME_DIRS "@CMAKE_BINARY_DIR@/lib") +- endif () +-endif() ++if (WIN32) ++ set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_RUNTIME_DIR@") ++else () ++ set (VTK_RUNTIME_DIRS "@CMAKE_INSTALL_PREFIX@/@VTK_INSTALL_LIBRARY_DIR@") ++endif () + + # Setup VTK-m if it was enabled + set(VTK_HAS_VTKM @VTK_HAS_VTKM@) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index c2d12c498..4ddfb5334 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -34,6 +34,7 @@ vcpkg_from_github( hdf5_static.patch fix-find-lzma.patch fix-proj4.patch + fix-VTKConfig-cmake.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, |