diff options
| author | Joe Marrero <manvscode@gmail.com> | 2019-09-16 19:40:00 -0400 |
|---|---|---|
| committer | Griffin Downs <35574547+grdowns@users.noreply.github.com> | 2019-09-16 16:39:59 -0700 |
| commit | 8413b901d71ad2a1807f3bcb4dedc0835efed541 (patch) | |
| tree | da55ce5bbcabc856c4be7335a13da0820b590e6c | |
| parent | 076b4f1e8300ff79e08305b20941f38e9ddd5b85 (diff) | |
| download | vcpkg-8413b901d71ad2a1807f3bcb4dedc0835efed541.tar.gz vcpkg-8413b901d71ad2a1807f3bcb4dedc0835efed541.zip | |
[VTK] VTK links with release version of LMZA in debug build instead of debu… (#7933)
* VTK links with release version of LMZA in debug build instead of debug version.
* Bump version
| -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, |