diff options
| author | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
|---|---|---|
| committer | John Spaith <jspaith@windows.microsoft.com> | 2019-10-10 09:36:18 -0700 |
| commit | 17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1 (patch) | |
| tree | 7baa6f699aa57601dbba4ace876fad45958878fc /ports/vtk | |
| parent | 1d4189d1dde0fa8bbcbc6237cc33b85bca0512e1 (diff) | |
| parent | 2b049c47b5b2e003f8bcfe6707d4b0eaf8d1b569 (diff) | |
| download | vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.tar.gz vcpkg-17c9b6bac8270b9740e5d824c6ebfff6cc7d5ed1.zip | |
Merge from master
Diffstat (limited to 'ports/vtk')
| -rw-r--r-- | ports/vtk/CONTROL | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-find-lz4.patch | 2 | ||||
| -rw-r--r-- | ports/vtk/fix-find-lzma.patch | 2 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 5b95fede8..e4f771407 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,5 +1,5 @@ Source: vtk -Version: 8.2.0-6 +Version: 8.2.0-8 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-lz4.patch b/ports/vtk/fix-find-lz4.patch index 7389a24f4..488640de8 100644 --- a/ports/vtk/fix-find-lz4.patch +++ b/ports/vtk/fix-find-lz4.patch @@ -6,7 +6,7 @@ index 07343e1f79..b43a9af2c7 100644 - -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_library(LZ4_LIBRARY_DEBUG NAMES lz4d PATH_SUFFIXES debug/lib) find_path(LZ4_INCLUDE_DIRS NAMES lz4.h) +if(NOT LZ4_LIBRARY_DEBUG) diff --git a/ports/vtk/fix-find-lzma.patch b/ports/vtk/fix-find-lzma.patch index a194b6f9b..b2e375fc4 100644 --- a/ports/vtk/fix-find-lzma.patch +++ b/ports/vtk/fix-find-lzma.patch @@ -6,7 +6,7 @@ index 213ab18df1..1e290da4cb 100644 -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_library(LZMA_LIBRARY_DEBUG NAMES lzmad PATH_SUFFIXES debug/lib) find_path(LZMA_INCLUDE_DIRS NAMES lzma.h) +select_library_configurations(LZMA) diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index a7181ca98..472c06b4b 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -73,6 +73,7 @@ if(VTK_WITH_QT) endif() if(VTK_WITH_PYTHON) + vcpkg_find_acquire_program(PYTHON3) list(APPEND ADDITIONAL_OPTIONS -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3 @@ -128,6 +129,7 @@ vcpkg_configure_cmake( -DModule_vtkGUISupportMFC=${Module_vtkGUISupportMFC} -DModule_vtkRenderingOpenVR=${Module_vtkRenderingOpenVR} -DVTK_Group_MPI=${VTK_Group_MPI} + -DPYTHON_EXECUTABLE=${PYTHON3} ${ADDITIONAL_OPTIONS} ) |