From 8413b901d71ad2a1807f3bcb4dedc0835efed541 Mon Sep 17 00:00:00 2001 From: Joe Marrero Date: Mon, 16 Sep 2019 19:40:00 -0400 Subject: =?UTF-8?q?[VTK]=20VTK=20links=20with=20release=20version=20of=20L?= =?UTF-8?q?MZA=20in=20debug=20build=20instead=20of=20debu=E2=80=A6=20(#793?= =?UTF-8?q?3)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * VTK links with release version of LMZA in debug build instead of debug version. * Bump version --- ports/vtk/CONTROL | 2 +- ports/vtk/fix-find-lzma.patch | 16 ++++++++++++++++ ports/vtk/portfile.cmake | 1 + 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 ports/vtk/fix-find-lzma.patch 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, -- cgit v1.2.3