Skip to content

Commit

Permalink
[vtk] Fix OpenGL feature (#19735)
Browse files Browse the repository at this point in the history
* [vtk] Fix typo that breaks OpenGL feature

Missspelled "VTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2"

* [vtk] Bump version
  • Loading branch information
jpauwels authored Aug 26, 2021
1 parent 410a157 commit e0a5659
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ports/vtk/CONTROL
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Source: vtk
Version: 9.0.1
Port-Version: 6
Port-Version: 7
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
Expand Down Expand Up @@ -47,4 +47,4 @@ Build-Depends: vtk[core]

Feature: all
Description: Build all vtk modules
Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows)
Build-Depends: libmysql, ffmpeg, gdal, vtk[core, qt, python, mpi], vtk[core, atlmfc, utf8] (windows)
7 changes: 4 additions & 3 deletions ports/vtk/portfile.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ endif()

if("opengl" IN_LIST FEATURES)
list(APPEND ADDITIONAL_OPTIONS
-DVTK_MODULE_ENABLE_VTK_DomainsChemestryOpenGL2=YES
-DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES
-DVTK_MODULE_ENABLE_VTK_ImagingOpenGL2=YES
-DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES
-DVTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2=YES
Expand Down Expand Up @@ -114,8 +114,9 @@ if("all" IN_LIST FEATURES)
endif()

vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
"cuda" VTK_USE_CUDA
"all" VTK_BUILD_ALL_MODULES
FEATURES
"cuda" VTK_USE_CUDA
"all" VTK_BUILD_ALL_MODULES
)


Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -6666,7 +6666,7 @@
},
"vtk": {
"baseline": "9.0.1",
"port-version": 6
"port-version": 7
},
"vtk-dicom": {
"baseline": "0.8.12-1",
Expand Down
5 changes: 5 additions & 0 deletions versions/v-/vtk.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "4a64bbb016d5ecf20be3df3bf850748f9f885502",
"version-string": "9.0.1",
"port-version": 7
},
{
"git-tree": "78be7ee36f34395e4d5511fd61457c4f7178a438",
"version-string": "9.0.1",
Expand Down

0 comments on commit e0a5659

Please sign in to comment.