[CGNS|VTK-M|VTK|ParaView] Update ports (#18248)

* [cgns] update to 4.2.0

* [vtk-m] update to 1.6.0

* [vtk] Update to 9.0.1-pv5.9.1
- VTK update to match release version of ParaView

* [ParaView] Update to 5.9.1

* version stuff

* fix automatic svg linkage in static builds

* update qt5-svg

* revisit vtk
- fix build with vtk-m 1.6
- remove unused patches
- remove comments

* bump version

* remove two commented lines

* version stuff

* remove old PR version

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>

3 files changed, 37 insertions, 31 deletions

diff --git a/ports/vtk-m/CONTROL b/ports/vtk-m/CONTROL
deleted file mode 100644
index e221eecce..000000000
--- a/ports/vtk-m/CONTROL
+++ /dev/null
@@ -1,24 +0,0 @@
-Source: vtk-m

-Version: 1.5.0

-Port-Version: 1

-Homepage: https://gitlab.kitware.com/vtk/vtk-m/

-Description: VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.

-Supports: x64 & !uwp

-

-Feature: cuda

-Description: Use the NVIDIA CUDA device adapter.

-Build-Depends: cuda

-

-Feature: omp

-Description: Use the OpenMP device adapter.

-

-Feature: tbb

-Description: Use the Intel TBB device adapter.

-Build-Depends: tbb

-

-Feature: mpi

-Description: Use the MPI controller.

-Build-Depends: mpi

-

-Feature: double

-Description: Use double precision in floating point calculations

diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake
index c33eb065f..b8e90bc98 100644
--- a/ports/vtk-m/portfile.cmake
+++ b/ports/vtk-m/portfile.cmake
@@ -40,20 +40,17 @@ list(APPEND OPTIONS -DBUILD_TESTING=OFF)
 vcpkg_from_gitlab(GITLAB_URL "https://gitlab.kitware.com" 

                   OUT_SOURCE_PATH SOURCE_PATH 

                   REPO vtk/vtk-m 

-                  REF f2aa6ad5be1a97e3fb41ef4680ee2c76c3434ac0 # v1.5.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build

-                  SHA512 35e8a2c0ad6cd3c1f02a71a50d781c89f93909ad27030b406fd69f4fea5c1862c48a6e541fd07562947322c3a69bdfdb54206ae51bb86ef7a710f9e9898e9638

+                  REF 13a117e0e8935eef3f320b5a1cd71d9911ad9853 # v1.6.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build

+                  SHA512 54f7f52ab4ee7954b6a303ffd3b8bcb18105b5d2fd8ed54b4e487fce2ebfbc51507e632189f775c79eea22ad24bd56bca401ddd679fc03d787342dd33d2ba18b

                   FILE_DISAMBIGUATOR 1)

-                  # For people only wanting vtk-m and not VTK 

-                  #REF 74ffad9bd0679d061bc87e544a728f1c3c926269 # v1.5.1

-                  #SHA512 c9e1c18432b6c11ae086445255acf9477fe4c888122a2b2a9713dc63a40d2e4c2375742157526b5f0869f14c62a4ad66d81ee58d6cc75a1d53a1d615525a03c9)

 vcpkg_configure_cmake(SOURCE_PATH ${SOURCE_PATH} 

                       PREFER_NINJA 

                       OPTIONS ${OPTIONS})

 vcpkg_install_cmake()

-vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.5 TARGET_PATH share/vtkm)

+vcpkg_fixup_cmake_targets(CONFIG_PATH lib/cmake/vtkm-1.6 TARGET_PATH share/vtkm)

 

 file(READ ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake _contents)

-string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.5")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents})

+string(REPLACE [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.6")]] [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]] _contents ${_contents})

 file(WRITE ${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake ${_contents})

 

 file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)

diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json
new file mode 100644
index 000000000..0b5c4fcc6
--- /dev/null
+++ b/ports/vtk-m/vcpkg.json
@@ -0,0 +1,33 @@
+{
+  "name": "vtk-m",
+  "version-semver": "1.6.0",
+  "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.",
+  "homepage": "https://gitlab.kitware.com/vtk/vtk-m/",
+  "supports": "x64 & !uwp",
+  "features": {
+    "cuda": {
+      "description": "Use the NVIDIA CUDA device adapter.",
+      "dependencies": [
+        "cuda"
+      ]
+    },
+    "double": {
+      "description": "Use double precision in floating point calculations"
+    },
+    "mpi": {
+      "description": "Use the MPI controller.",
+      "dependencies": [
+        "mpi"
+      ]
+    },
+    "omp": {
+      "description": "Use the OpenMP device adapter."
+    },
+    "tbb": {
+      "description": "Use the Intel TBB device adapter.",
+      "dependencies": [
+        "tbb"
+      ]
+    }
+  }
+}