microsoft · BillyONeal · Jan 20, 2023 · Jun 2, 2021 · Jun 2, 2021 · Jun 2, 2021
diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake
@@ -36,6 +36,7 @@ vcpkg_cmake_configure(
     OPTIONS
         ${FEATURE_OPTIONS}
         ${CGNS_BUILD_OPTS}
+        -DCGNS_ENABLE_SCOPING:BOOL=ON
 )
 
 vcpkg_cmake_install()

diff --git a/ports/hdf5/hdf5_config.patch b/ports/hdf5/hdf5_config.patch
@@ -13,10 +13,10 @@ index 4d02c9c..8c10d2d 100644
    set (${HDF5_PACKAGE_NAME}_MPI_C_INCLUDE_PATH "@MPI_C_INCLUDE_DIRS@")
    set (${HDF5_PACKAGE_NAME}_MPI_C_LIBRARIES    "@MPI_C_LIBRARIES@")
    if (${HDF5_PACKAGE_NAME}_BUILD_FORTRAN)
-@@ -111,11 +114,11 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR  @HDF5_VERSION_MINOR@)
+@@ -111,11 +114,9 @@ set (${HDF5_PACKAGE_NAME}_VERSION_MINOR  @HDF5_VERSION_MINOR@)
  # project which has already built hdf5 as a subproject
  #-----------------------------------------------------------------------------
- if (NOT TARGET "@HDF5_PACKAGE@")
+-if (NOT TARGET "@HDF5_PACKAGE@")
 -  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT AND ${HDF5_PACKAGE_NAME}_PACKAGE_EXTLIBS)
 -    include (@PACKAGE_SHARE_INSTALL_DIR@/@ZLIB_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
 +  if (${HDF5_PACKAGE_NAME}_ENABLE_Z_LIB_SUPPORT)
@@ -26,6 +26,6 @@ index 4d02c9c..8c10d2d 100644
 -    include (@PACKAGE_SHARE_INSTALL_DIR@/@SZIP_PACKAGE_NAME@@HDF_PACKAGE_EXT@-targets.cmake)
 +  if (${HDF5_PACKAGE_NAME}_ENABLE_SZIP_SUPPORT)
 +    find_dependency(szip)
-   endif ()
+-  endif ()
    include (@PACKAGE_SHARE_INSTALL_DIR@/@HDF5_PACKAGE@@HDF_PACKAGE_EXT@-targets.cmake)
  endif ()
diff --git a/ports/hdf5/portfile.cmake b/ports/hdf5/portfile.cmake
@@ -152,3 +152,5 @@ file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 configure_file("${CMAKE_CURRENT_LIST_DIR}/vcpkg-cmake-wrapper.cmake" "${CURRENT_PACKAGES_DIR}/share/${PORT}/vcpkg-cmake-wrapper.cmake" @ONLY)
 
 file(RENAME "${CURRENT_PACKAGES_DIR}/share/${PORT}/data/COPYING" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright")
+
+vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/H5public.h" "#define H5public_H" "#define H5public_H\n#ifndef H5_BUILT_AS_DYNAMIC_LIB\n#define H5_BUILT_AS_DYNAMIC_LIB\n#endif\n")
diff --git a/ports/hdf5/vcpkg-cmake-wrapper.cmake b/ports/hdf5/vcpkg-cmake-wrapper.cmake
@@ -1,4 +1,3 @@
-
 if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.3)
     cmake_policy(PUSH)
     cmake_policy(SET CMP0057 NEW)

diff --git a/ports/netcdf-c/use_targets.patch b/ports/netcdf-c/use_targets.patch
@@ -130,7 +130,7 @@ index 9d68eec..b3be259 100644
 
  # include target information
 +include(CMakeFindDependencyMacro)
-+find_dependency(HDF5 CONFIG)
++find_dependency(hdf5 CONFIG)
 +find_dependency(CURL CONFIG)
  include("${CMAKE_CURRENT_LIST_DIR}/netCDFTargets.cmake")
 

diff --git a/ports/paraview/catalyst_install.patch b/ports/paraview/catalyst_install.patch
diff --git a/ports/paraview/cgns.patch b/ports/paraview/cgns.patch
diff --git a/ports/paraview/external_vtk.patch b/ports/paraview/external_vtk.patch
@@ -1,20 +1,8 @@
-diff --git a/CMake/ParaViewClient.cmake b/CMake/ParaViewClient.cmake
-index b0dea2b32..b035a9dc3 100644
---- a/CMake/ParaViewClient.cmake
-+++ b/CMake/ParaViewClient.cmake
-@@ -516,6 +516,7 @@ function (paraview_client_documentation)
-     NAMES xmlpatterns-qt5 xmlpatterns
-     HINTS "${Qt5_DIR}/../../../bin"
-           "${Qt5_DIR}/../../../libexec/qt5/bin"
-+          "${Qt5_DIR}/../../../tools/qt5/bin"
-     DOC   "Path to xmlpatterns")
-   mark_as_advanced(qt_xmlpatterns_executable)
-
 diff --git a/CMake/ParaViewOptions.cmake b/CMake/ParaViewOptions.cmake
-index f544a7c06..c51278931 100644
+index 70c771151..14df81490 100644
 --- a/CMake/ParaViewOptions.cmake
 +++ b/CMake/ParaViewOptions.cmake
-@@ -88,7 +88,7 @@ endif()
+@@ -99,7 +99,7 @@ endif()
  #========================================================================
 
  # XXX(VTK): External VTK is not yet actually supported.
@@ -24,20 +12,34 @@ index f544a7c06..c51278931 100644
  mark_as_advanced(PARAVIEW_USE_EXTERNAL_VTK)
  else ()
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 1af77d164..bebcb83ee 100644
+index 6ee167322..628745584 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -72,7 +72,8 @@ if (NOT CMAKE_INSTALL_LICENSEDIR)
+@@ -73,7 +73,11 @@ if (NOT CMAKE_INSTALL_LICENSEDIR)
  endif ()
 
  set(paraview_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/CMake")
 -set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
-+set(vtk_cmake_dir "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/share/vtk")
-+message(STATUS "vtk_cmake_dir:${vtk_cmake_dir}")
++if (PARAVIEW_USE_EXTERNAL_VTK)
++  find_package(vtk CONFIG REQUIRED)
++  get_filename_component(vtk_cmake_dir "${vtk_CONFIG}" DIRECTORY )
++endif()
++
  if (NOT IS_DIRECTORY "${vtk_cmake_dir}")
    message(FATAL_ERROR
      "Failed to find the VTK CMake directory. Did you forget to initialize the "
-@@ -383,9 +384,73 @@ endif ()
+@@ -242,9 +246,7 @@ if (PARAVIEW_USE_FORTRAN)
+   enable_language(Fortran OPTIONAL)
+ endif ()
+
+-if (PARAVIEW_USE_EXTERNAL_VTK)
+-  find_package(VTK REQUIRED)
+-else ()
++if (NOT PARAVIEW_USE_EXTERNAL_VTK)
+   list(APPEND CMAKE_MODULE_PATH
+     "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
+   include(vtkCMakeBackports)
+@@ -423,9 +425,73 @@ endif ()
 
  if (PARAVIEW_USE_EXTERNAL_VTK)
    if (paraview_required_modules OR paraview_unrecognized_modules)
@@ -114,7 +116,7 @@ index 1af77d164..bebcb83ee 100644
    endif ()
 
    if (PARAVIEW_USE_PYTHON)
-@@ -459,7 +524,7 @@ else ()
+@@ -508,7 +574,7 @@ else ()
    endif()
 
    # Set up these variables now so that modules may acess them
@@ -123,7 +125,7 @@ index 1af77d164..bebcb83ee 100644
      set(vtk_cmake_dir
        "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
      set(vtk_cmake_destination
-@@ -558,6 +623,9 @@ set(_paraview_add_tests_default_data_directory
+@@ -642,6 +708,9 @@ set(_paraview_add_tests_default_data_directory
  set(_paraview_add_tests_default_test_data_target
    "ParaViewData")
 
@@ -133,17 +135,17 @@ index 1af77d164..bebcb83ee 100644
  vtk_module_build(
    MODULES             ${paraview_modules}
    KITS                ${paraview_kits}
-@@ -596,9 +664,11 @@ vtk_module_build(
-   TEST_OUTPUT_DATA_DIRECTORY  "${paraview_test_data_directory_output}")
+@@ -703,9 +772,11 @@ if (PARAVIEW_ENABLE_CATALYST)
+ endif ()
 
  include(vtkModuleJson)
 -vtk_module_json(
 -  MODULES ${vtk_modules}
 -  OUTPUT "vtk-modules.json")
 +if(NOT PARAVIEW_USE_EXTERNAL_VTK)
-+  vtk_module_json(
-+    MODULES ${vtk_modules}
-+    OUTPUT "vtk-modules.json")
++    vtk_module_json(
++      MODULES ${vtk_modules}
++      OUTPUT "vtk-modules.json")
 +endif()
  vtk_module_json(
    MODULES ${paraview_modules}

diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake
@@ -1,8 +1,5 @@
-file(READ "${CMAKE_CURRENT_LIST_DIR}/vcpkg.json" _vcpkg_json)
-string(JSON _ver_string GET "${_vcpkg_json}" "version")
-string(REGEX MATCH "^[0-9]+\.[0-9]+" VERSION "${_ver_string}")
-
-vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
+set(VERSION_MAJOR_MINOR 5.11)
+vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
     "cuda"         PARAVIEW_USE_CUDA            #untested; probably only affects internal VTK build so it does nothing here 
     "all_modules"  PARAVIEW_BUILD_ALL_MODULES   #untested
     "mpi"          PARAVIEW_USE_MPI             #untested
@@ -14,16 +11,14 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO Kitware/ParaView
-    REF aad4b6f1e92154879209102edfab8367f1e7d191 # v5.9.1
-    SHA512  330fcb8525bdee9b02e06f05d4e91cc4d631d03df99c30f82bb97da5e06b5a2a6ff4ecee807b6f6c7110d2f53db1c17e4670d6078ae1cc89cfd7089b67d05bdb
+    REF d41b38848860f122232fbdafc50e77323e91dc09 # v5.11.0
+    SHA512  441fdb0053e5d9c38e77ece8251888a239c59bcc58e789516bedbb6b0d28e671fd8bc9e1848fff07cd999628a9666baf5a1eee8da477e1bbfd204b1a5c39ae1e
     HEAD_REF master
     PATCHES
         external_vtk.patch
-        cgns.patch
         python_include.patch
         python_wrapper.patch
         add-tools-option.patch
-        catalyst_install.patch
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
@@ -38,33 +33,39 @@ vcpkg_from_gitlab(
     OUT_SOURCE_PATH VISITIT_SOURCE_PATH
     GITLAB_URL https://gitlab.kitware.com/
     REPO paraview/visitbridge
-    REF 42fce8ad6863ca2c1308741955cca1d0cf570d22
-    SHA512 03a6254989d3e286a462683af92caba1e90decbdcfb2e729f2d7e1116b04d63a05c28d02c4615d780fdd0d33e2719f96617233d6e0602410cc6d894f92fe6ee3
+    REF df098f4148a96d62c388861c1d476039e02224ae
+    SHA512 002c2c934ef7e64c89b1567f406db1ebb90532817062e7016c248ba8ae85a88f1a35bc3963a9577ec08ba742a0e7fb91022c29aaaa0bddf0a1d585074341733e
     PATCHES 
         ${VisItPatches}
 )
+
+#vtkicet https://gitlab.kitware.com/paraview/paraview/-/tree/release/ThirdParty/IceT
+
+#VTK_MODULE_USE_EXTERNAL_ParaView_protobuf
+#NVPipe?
+
 #Get QtTesting Plugin
 vcpkg_from_gitlab(
     OUT_SOURCE_PATH QTTESTING_SOURCE_PATH
     GITLAB_URL https://gitlab.kitware.com/
     REPO paraview/qttesting
-    REF 72290689c7c55622d729bf95c97e7627026a234e
-    SHA512  fb18c6745b784b294f01d5391ba4cdcaa109443a193eb35fbf1553fdb3a4f7217f784fd4893fab72784cec5bd3fc821bf1e766e943d0f562c5917788800599b0
+    REF 08d96e9277bc4c26804fd77ce1b4fa5c791605ae # https://gitlab.kitware.com/paraview/qttesting/-/merge_requests/53 for Qt6
+    SHA512  cb4acdfe1206bd8bae4f70185c8ca1ce555cf983a1d1e97293dac544ab13b039638bfe0d1e448f9589db92b6ed23b9b940157e72d9ec9e3994ea9858ab1722ec
 )
 
-#Get Catalyst
+#TODO: Add Icet
 vcpkg_from_gitlab(
-    OUT_SOURCE_PATH CATALYST_SOURCE_PATH
+    OUT_SOURCE_PATH ICET_SOURCE_PATH
     GITLAB_URL https://gitlab.kitware.com/
-    REPO paraview/catalyst
-    REF e36e4a5f3c67011c97c335cce23d2bc3abc0d086
-    SHA512  9926c272ab8785997f9c98cfaf696943081b0ddb0e9e343602722671b6f3eaef5b8de5dd049ca783b6844c7e328a96e1b09c8b24c16f001eeeed2d154d290480
+    REPO paraview/IceT
+    REF 32816fe5592de3be664da6f8466a546f221d8532
+    SHA512  33d5e8f2ecdc20d305d04c23fc3a3121d3c5305ddff7f5b71cee1a2c2183c4b36c9d0bd91e9dba5f2369e237782d7dbcf635d2e1814ccde88570647c890edc9d
 )
 
 
 file(COPY "${VISITIT_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/Utilities/VisItBridge")
 file(COPY "${QTTESTING_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/QtTesting/vtkqttesting")
-file(COPY "${CATALYST_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/catalyst/vtkcatalyst/catalyst")
+file(COPY "${ICET_SOURCE_PATH}/" DESTINATION "${SOURCE_PATH}/ThirdParty/IceT/vtkicet")
 
 if("python" IN_LIST FEATURES)
     vcpkg_find_acquire_program(PYTHON3)
@@ -78,6 +79,7 @@ endif()
 vcpkg_cmake_configure(
     SOURCE_PATH "${SOURCE_PATH}"
      OPTIONS ${FEATURE_OPTIONS}
+        -DPARAVIEW_PLUGIN_DISABLE_XML_DOCUMENTATION:BOOL=ON
         -DPARAVIEW_BUILD_WITH_EXTERNAL:BOOL=ON
         -DPARAVIEW_USE_EXTERNAL_VTK:BOOL=ON
         -DPARAVIEW_ENABLE_VISITBRIDGE:BOOL=ON
@@ -107,15 +109,15 @@ if(CMAKE_HOST_UNIX)
     set(ENV{LD_LIBRARY_PATH} "${BACKUP_LD_LIBRARY_PATH}")
 endif()
 
-vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/paraview-${VERSION})
+vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/paraview-${VERSION_MAJOR_MINOR})
 
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
 # see https://gitlab.kitware.com/paraview/paraview/-/issues/21328
-file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION}/vtkCPConfig.h")
+file(REMOVE "${CURRENT_PACKAGES_DIR}/include/paraview-${VERSION_MAJOR_MINOR}/vtkCPConfig.h")
 
-set(TOOLVER pv${VERSION})
+set(TOOLVER pv${VERSION_MAJOR_MINOR})
 set(TOOLS   paraview
             pvbatch
             pvdataserver
@@ -169,7 +171,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
         endif()
     endmacro()
 
-    set(to_move Lib paraview-${VERSION} paraview-config)
+    set(to_move Lib paraview-${VERSION_MAJOR_MINOR} paraview-config)
     foreach(name ${to_move})
         move_bin_to_lib(${name})
     endforeach()

diff --git a/ports/paraview/vcpkg.json b/ports/paraview/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "paraview",
-  "version": "5.9.1",
-  "port-version": 2,
+  "version": "5.11.0",
   "description": "VTK-based Data Analysis and Visualization Application",
   "homepage": "https://www.paraview.org/",
   "license": "BSD-3-Clause",