diff options
| author | robbie-li <robbie.xwli@gmail.com> | 2021-03-27 06:58:02 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-26 15:58:02 -0700 |
| commit | 9f6157af4e5b04ab3cc63150a20b1bad901a7d0b (patch) | |
| tree | 6c2fc1e6892f92607509f22b649d171a17d551ba | |
| parent | e814436c12d1df0b401bbecd5360aaad3dd3078a (diff) | |
| download | vcpkg-9f6157af4e5b04ab3cc63150a20b1bad901a7d0b.tar.gz vcpkg-9f6157af4e5b04ab3cc63150a20b1bad901a7d0b.zip | |
[vtk] Add support for unicode path for VTK reader/writer (#16779)
* feat: Add support for unicode path for VTK reader/writer
* update base line
Co-authored-by: Xiaowei Li <xiaowei.li@csdental.com>
| -rw-r--r-- | ports/vtk/CONTROL | 8 | ||||
| -rw-r--r-- | ports/vtk/portfile.cmake | 6 | ||||
| -rw-r--r-- | versions/baseline.json | 2 | ||||
| -rw-r--r-- | versions/v-/vtk.json | 5 |
4 files changed, 18 insertions, 3 deletions
diff --git a/ports/vtk/CONTROL b/ports/vtk/CONTROL index 1c1bca670..058530581 100644 --- a/ports/vtk/CONTROL +++ b/ports/vtk/CONTROL @@ -1,6 +1,6 @@ Source: vtk Version: 9.0.1 -Port-Version: 4 +Port-Version: 5 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[core], libjpeg-turbo, proj4, lz4, liblzma, libtheora, eigen3, double-conversion, pugixml, libharu[notiffsymbols], sqlite3, netcdf-c, utfcpp, libogg, pegtl-2 @@ -41,6 +41,10 @@ Feature: opengl Description: All opengl related modules Build-Depends: vtk[core] +Feature: utf8 +Description: Enables vtk reader/writer with utf-8 path support +Build-Depends: vtk[core] + Feature: all Description: Build all vtk modules -Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc] (windows)
\ No newline at end of file +Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows)
\ No newline at end of file diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 9f75240c5..ecbd2be3a 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -95,6 +95,12 @@ if("cuda" IN_LIST FEATURES AND CMAKE_HOST_WIN32) vcpkg_add_to_path("$ENV{CUDA_PATH}/bin") endif() +if("utf8" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DKWSYS_ENCODING_DEFAULT_CODEPAGE=CP_UTF8 + ) +endif() + if("all" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_USE_TK=OFF # TCL/TK currently not included in vcpkg diff --git a/versions/baseline.json b/versions/baseline.json index 8448a3822..45c19c289 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -6214,7 +6214,7 @@ }, "vtk": { "baseline": "9.0.1", - "port-version": 4 + "port-version": 5 }, "vtk-dicom": { "baseline": "0.8.12-1", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 84c38d33f..3eee5db7b 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "88d95daae73bf5c3413bb18188c81f9ea752e418", + "version-string": "9.0.1", + "port-version": 5 + }, + { "git-tree": "94667926df104c70c0229cc96b36ec41f3911853", "version-string": "9.0.1", "port-version": 4 |