mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 19:42:46 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vtk] Fix FindLZ4 (#4676)

Browse Source 
Fix find lz4 library of debug configuration.
This commit is contained in:
Tsukasa Sugiura 2018-11-09 03:46:25 +09:00 committed by Robert Schumacher
parent efe7c7eb28
commit 7bb03fd2fc
3 changed files with 22 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 Source: vtk
Version: 8.1.0-2 Version: 8.1.0-3
Description: Software system for 3D computer graphics, image processing, and visualization 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 Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora

20
ports/vtk/fix-find-lz4.patch Normal file
View File

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

1
ports/vtk/portfile.cmake
View File

@ -67,6 +67,7 @@ vcpkg_from_github(
fix-find-libharu.patch fix-find-libharu.patch
fix-find-mysql.patch fix-find-mysql.patch
fix-find-odbc.patch fix-find-odbc.patch
fix-find-lz4.patch
) )
# Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK, # Remove the FindGLEW.cmake and FindPythonLibs.cmake that are distributed with VTK,