diff options
| author | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
|---|---|---|
| committer | Alexander Neumann <alexander.neumann@hamburg.de> | 2019-09-20 12:24:23 +0200 |
| commit | 5b1e426929b40a9b60809284993b424b841a28fc (patch) | |
| tree | bd12300ad859bababb7d4acc03700fd31949fddc /ports/vtk | |
| parent | 279e25aecfe30f55296881ea9b0236c1d6ee030a (diff) | |
| parent | 358ec0954d9b71b0def4fd4b4dbafdd0b8478d81 (diff) | |
| download | vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.tar.gz vcpkg-5b1e426929b40a9b60809284993b424b841a28fc.zip | |
Merge remote-tracking branch 'upstream/master' into path_separator
# Conflicts:
# scripts/cmake/vcpkg_common_definitions.cmake
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-find-lzma.patch | 16 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
3 files changed, 18 insertions, 1 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index c44c77880..5b95fede8 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.2.0-5 +Version: 8.2.0-6 Description: Software system for 3D computer graphics, image processing, and visualization Homepage: https://github.com/Kitware/VTK Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora, atlmfc (windows), eigen3, double-conversion, pugixml, libharu, sqlite3, netcdf-c diff --git a/ports/vtk/fix-find-lzma.patch b/ports/vtk/fix-find-lzma.patch new file mode 100644 index 000000000..a194b6f9b --- /dev/null +++ b/ports/vtk/fix-find-lzma.patch @@ -0,0 +1,16 @@ +diff --git a/CMake/FindLZMA.cmake b/CMake/FindLZMA.cmake +index 213ab18df1..1e290da4cb 100644 +--- a/CMake/FindLZMA.cmake ++++ b/CMake/FindLZMA.cmake +@@ -1,7 +1,10 @@ + +-find_library(LZMA_LIBRARIES NAMES lzma) ++find_library(LZMA_LIBRARY_RELEASE NAMES lzma PATH_SUFFIXES lib) ++find_library(LZMA_LIBRARY_DEBUG NAME lzmad PATH_SUFFIXES debug/lib) + find_path(LZMA_INCLUDE_DIRS NAMES lzma.h) + ++select_library_configurations(LZMA) ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(LZMA + DEFAULT_MSG diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 69d2ddd2a..a7181ca98 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -49,6 +49,7 @@ vcpkg_from_github( fix_ogg_linkage.patch fix-pugixml-link.patch hdf5_static.patch + fix-find-lzma.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, |