diff options
| author | Alexander Karatarakis <alex@karatarakis.com> | 2017-08-11 08:39:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-11 08:39:46 -0700 |
| commit | 443ab4850a3469ce500d96f7e10ef2d7af197615 (patch) | |
| tree | d965101db39525500c64f38cc7acd7e37215d144 | |
| parent | aa266ca49568cb6f7086e33c593c88fb09dff21f (diff) | |
| parent | 199288a8f50a2839951bc51f3aaac267f5cdc1f0 (diff) | |
| download | vcpkg-443ab4850a3469ce500d96f7e10ef2d7af197615.tar.gz vcpkg-443ab4850a3469ce500d96f7e10ef2d7af197615.zip | |
Merge pull request #1632 from albertziegenhagel/vtk-use-libtheora
[vtk] Use system libtheora
| -rw-r--r-- | ports/vtk/CONTROL | 4 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 6a95b2f37..652c27700 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,4 +1,4 @@ Source: vtk -Version: 8.0.0 +Version: 8.0.0-1 Description: Software system for 3D computer graphics, image processing, and visualization -Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi, libjpeg-turbo, proj, lz4 +Build-Depends: zlib, libpng, tiff, libxml2, jsoncpp, glew, freetype, expat, hdf5, qt5, msmpi, libjpeg-turbo, proj, lz4, libtheora diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index f5d1fdda3..ff9d457f1 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -43,7 +43,6 @@ vcpkg_configure_cmake( SOURCE_PATH ${SOURCE_PATH} PREFER_NINJA OPTIONS - -DVTK_INSTALL_INCLUDE_DIR=include -DBUILD_TESTING=OFF -DBUILD_EXAMPLES=OFF -DVTK_Group_MPI=ON @@ -65,10 +64,11 @@ vcpkg_configure_cmake( -DVTK_USE_SYSTEM_LZ4=ON # -DVTK_USE_SYSTEM_NETCDF=ON # -DVTK_USE_SYSTEM_NETCDFCPP=ON - # -DVTK_USE_SYSTEM_OGGTHEORA=ON + -DVTK_USE_SYSTEM_OGGTHEORA=ON -DVTK_USE_SYSTEM_PNG=ON -DVTK_USE_SYSTEM_TIFF=ON -DVTK_USE_SYSTEM_ZLIB=ON + -DVTK_INSTALL_INCLUDE_DIR=include -DVTK_INSTALL_DATA_DIR=share/vtk/data -DVTK_INSTALL_DOC_DIR=share/vtk/doc -DVTK_INSTALL_PACKAGE_DIR=share/vtk @@ -154,6 +154,7 @@ set(SYSTEM_THIRD_PARTY_MODULES vtklibproj4 vtklibxml2 vtklz4 + vtkoggtheora vtkpng vtktiff vtkzlib |