diff options
| author | zhouqi <zhouqi.whu@hotmail.com> | 2018-12-05 16:59:08 +0800 |
|---|---|---|
| committer | zhouqi <zhouqi.whu@hotmail.com> | 2018-12-05 16:59:08 +0800 |
| commit | 2b410bea32837c8a498c3ce6ae88b82013fe2e52 (patch) | |
| tree | a7cf9d04d503658f30149a1d291aefaef2f65c87 /ports/vtk | |
| parent | 642e37b3c9f14d5f822239b630933d8eed7e8b70 (diff) | |
| parent | 5f63d0a5f77b4179df6dc10110637775a1d0fe69 (diff) | |
| download | vcpkg-2b410bea32837c8a498c3ce6ae88b82013fe2e52.tar.gz vcpkg-2b410bea32837c8a498c3ce6ae88b82013fe2e52.zip | |
Merge branch 'master' of https://github.com/zhouqime/vcpkg
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-find-lz4.patch | 20 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 1 |
3 files changed, 22 insertions, 1 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index e75795e74..d06f16331 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.1.0-2 +Version: 8.1.0-3 Description: Software system for 3D computer graphics, image processing, and visualization Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora diff --git a/ports/vtk/fix-find-lz4.patch b/ports/vtk/fix-find-lz4.patch new file mode 100644 index 000000000..7389a24f4 --- /dev/null +++ b/ports/vtk/fix-find-lz4.patch @@ -0,0 +1,20 @@ +diff --git a/CMake/FindLZ4.cmake b/CMake/FindLZ4.cmake +index 07343e1f79..b43a9af2c7 100644 +--- a/CMake/FindLZ4.cmake ++++ b/CMake/FindLZ4.cmake +@@ -1,7 +1,13 @@ +- +-find_library(LZ4_LIBRARIES NAMES lz4) ++find_library(LZ4_LIBRARY NAMES lz4 PATH_SUFFIXES lib) ++find_library(LZ4_LIBRARY_DEBUG NAME lz4d PATH_SUFFIXES debug/lib) + find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) + ++if(NOT LZ4_LIBRARY_DEBUG) ++ set(LZ4_LIBRARY_DEBUG ${LZ4_LIBRARY}) ++endif(NOT LZ4_LIBRARY_DEBUG) ++ ++set(LZ4_LIBRARIES optimized ${LZ4_LIBRARY} debug ${LZ4_LIBRARY_DEBUG}) ++ + include(FindPackageHandleStandardArgs) + find_package_handle_standard_args(LZ4 + DEFAULT_MSG diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index c547929ce..edb245eb0 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -67,6 +67,7 @@ vcpkg_from_github( fix-find-libharu.patch fix-find-mysql.patch fix-find-odbc.patch + fix-find-lz4.patch ) # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, |