mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-24 13:31:27 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[VTK] VTK links with release version of LMZA in debug build instead of debu… (#7933)

Browse Source 
* VTK links with release version of LMZA in debug build instead of debug version.

* Bump version
This commit is contained in:
Joe Marrero 2019-09-16 19:40:00 -04:00 committed by Griffin Downs
parent 076b4f1e83
commit 8413b901d7
3 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/vtk/CONTROL
View File

@ -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

16
ports/vtk/fix-find-lzma.patch Normal file
View File

@ -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

1
ports/vtk/portfile.cmake
View File

@ -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,