diff options
| author | Alvin <52727318+AlvinZhangH@users.noreply.github.com> | 2020-01-11 07:41:18 +0800 |
|---|---|---|
| committer | dan-shaw <51385773+dan-shaw@users.noreply.github.com> | 2020-01-10 15:41:18 -0800 |
| commit | 006c58ec10e5f4d7b93dc3b24026a3213803404a (patch) | |
| tree | 7cda5e5f46da4d0ba4d5b588ec2e9e4db924179a | |
| parent | 21f3e7d6988da47ac27b82572d032d04ab27281c (diff) | |
| download | vcpkg-006c58ec10e5f4d7b93dc3b24026a3213803404a.tar.gz vcpkg-006c58ec10e5f4d7b93dc3b24026a3213803404a.zip | |
[vtk] fix VTKConfig.cmake path (#9219)
* [vtk] fix VTKConfig.cmake path
* [vtk] Update the CONTROL version
| -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, |