mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-01-18 13:43:03 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUGFIX: [vtk] remove libharu as a core dependency (#2140)

Browse Source 
* [vtk:control] break out libharu

* [vtk:portfile] disable libharu

* [vtk:control] update version

* [vtk:portfile] remove useless comment
This commit is contained in:
xoviat 2017-11-06 12:35:12 -06:00 committed by Robert Schumacher
parent 5743b68bc2
commit 7fa618093d
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ports/vtk/CONTROL
View File

@ -1,7 +1,7 @@
Source: vtk Source: vtk
Version: 8.0.1-1 Version: 8.0.1-2
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, libharu Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, libjpeg-turbo, proj4, lz4, libtheora
Feature: openvr Feature: openvr
Description: OpenVR functionality for VTK Description: OpenVR functionality for VTK
@ -18,3 +18,7 @@ Build-Depends: msmpi
Feature: python Feature: python
Description: Python functionality for VTK Description: Python functionality for VTK
Build-Depends: python3 Build-Depends: python3
Feature: libharu
Description: PDF libharu functionality for VTK
Build-Depends: libharu

13
ports/vtk/portfile.cmake
View File

@ -37,6 +37,12 @@ else()
set(VTK_WITH_OPENVR OFF) set(VTK_WITH_OPENVR OFF)
endif() 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`, 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 # `libmysql` and `atlmfc` are listed as dependency in the CONTROL file
# ============================================================================= # =============================================================================
@ -104,6 +110,12 @@ if(VTK_WITH_OPENVR)
) )
endif() endif()
if(VTK_WITH_LIBHARU)
list(APPEND ADDITIONAL_OPTIONS
-DVTK_USE_SYSTEM_LIBHARU=ON
)
endif()
if(VTK_WITH_ALL_MODULES) if(VTK_WITH_ALL_MODULES)
list(APPEND ADDITIONAL_OPTIONS list(APPEND ADDITIONAL_OPTIONS
-DVTK_BUILD_ALL_MODULES=ON -DVTK_BUILD_ALL_MODULES=ON
@ -138,7 +150,6 @@ vcpkg_configure_cmake(
-DVTK_USE_SYSTEM_EXPAT=ON -DVTK_USE_SYSTEM_EXPAT=ON
-DVTK_USE_SYSTEM_FREETYPE=ON -DVTK_USE_SYSTEM_FREETYPE=ON
# -DVTK_USE_SYSTEM_GL2PS=ON # -DVTK_USE_SYSTEM_GL2PS=ON
-DVTK_USE_SYSTEM_LIBHARU=ON
-DVTK_USE_SYSTEM_JPEG=ON -DVTK_USE_SYSTEM_JPEG=ON
-DVTK_USE_SYSTEM_GLEW=ON -DVTK_USE_SYSTEM_GLEW=ON
-DVTK_USE_SYSTEM_HDF5=ON -DVTK_USE_SYSTEM_HDF5=ON