diff options
| author | xoviat <xoviat@users.noreply.github.com> | 2017-11-06 12:35:12 -0600 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2017-11-06 10:35:12 -0800 |
| commit | 7fa618093d76b160b2c4d02e4a5bba1d38c674d3 (patch) | |
| tree | 11199350f6231ab77bbd9741244e496d50f71f04 | |
| parent | 5743b68bc25d0ef72779bce8c1a1ea8f6c8448c5 (diff) | |
| download | vcpkg-7fa618093d76b160b2c4d02e4a5bba1d38c674d3.tar.gz vcpkg-7fa618093d76b160b2c4d02e4a5bba1d38c674d3.zip | |
BUGFIX: [vtk] remove libharu as a core dependency (#2140)
* [vtk:control] break out libharu
* [vtk:portfile] disable libharu
* [vtk:control] update version
* [vtk:portfile] remove useless comment
| -rw-r--r-- | ports/vtk/CONTROL | 8 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 13 |
2 files changed, 18 insertions, 3 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index d30e61506..2ef7ffeca 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,7 +1,7 @@ Source: vtk -Version: 8.0.1-1 +Version: 8.0.1-2 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, libharu +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora Feature: openvr Description: OpenVR functionality for VTK @@ -18,3 +18,7 @@ Build-Depends: msmpi Feature: python Description: Python functionality for VTK Build-Depends: python3 + +Feature: libharu +Description: PDF libharu functionality for VTK +Build-Depends: libharu diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 0a407e9ae..d865d1df2 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -37,6 +37,12 @@ else() set(VTK_WITH_OPENVR OFF) endif() +if("libharu" IN_LIST FEATURES) + set(VTK_WITH_LIBHARU ON) +else() + set(VTK_WITH_LIBHARU OFF) +endif() + set(VTK_WITH_ALL_MODULES OFF) # IMPORTANT: if ON make sure `qt5`, `mpi`, `python3`, `ffmpeg`, `gdal`, `fontconfig`, # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file # ============================================================================= @@ -104,6 +110,12 @@ if(VTK_WITH_OPENVR) ) endif() +if(VTK_WITH_LIBHARU) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_USE_SYSTEM_LIBHARU=ON + ) +endif() + if(VTK_WITH_ALL_MODULES) list(APPEND ADDITIONAL_OPTIONS -DVTK_BUILD_ALL_MODULES=ON @@ -138,7 +150,6 @@ vcpkg_configure_cmake( -DVTK_USE_SYSTEM_EXPAT=ON -DVTK_USE_SYSTEM_FREETYPE=ON # -DVTK_USE_SYSTEM_GL2PS=ON - -DVTK_USE_SYSTEM_LIBHARU=ON -DVTK_USE_SYSTEM_JPEG=ON -DVTK_USE_SYSTEM_GLEW=ON -DVTK_USE_SYSTEM_HDF5=ON |