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()
@@ -79,5 +80,9 @@ endif()
 file(REMOVE "${CURRENT_PACKAGES_DIR}/include/cgnsBuild.defs" "${CURRENT_PACKAGES_DIR}/include/cgnsconfig.h")
 file(INSTALL "${CURRENT_PORT_DIR}/cgnsconfig.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include") # the include is all that is needed
 
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/cgnslib.h" "defined(USE_DLL)" "1")
+endif()
+
 # Handle copyright
 configure_file("${SOURCE_PATH}/license.txt" "${CURRENT_PACKAGES_DIR}/share/${PORT}/copyright" COPYONLY)
diff --git a/ports/cgns/vcpkg.json b/ports/cgns/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "cgns",
   "version-semver": "4.3.0",
-  "port-version": 2,
+  "port-version": 3,
   "description": "The CFD General Notation System (CGNS) provides a standard for recording and recovering computer data associated with the numerical solution of fluid dynamics equations.",
   "homepage": "http://cgns.org/",
   "license": "Zlib",

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
@@ -157,3 +157,7 @@ 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")
+
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+    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")
+endif()
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/hdf5/vcpkg.json b/ports/hdf5/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "hdf5",
   "version": "1.12.2",
-  "port-version": 4,
+  "port-version": 5,
   "description": "HDF5 is a data model, library, and file format for storing and managing data",
   "homepage": "https://www.hdfgroup.org/downloads/hdf5/",
   "license": "BSD-3-Clause",

diff --git a/ports/matio/vcpkg.json b/ports/matio/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "matio",
-  "version-semver": "1.5.23",
+  "version": "1.5.23",
+  "port-version": 1,
   "description": "MATLAB MAT File I/O Library",
   "homepage": "https://github.com/tbeu/matio",
   "license": "BSD-2-Clause",
@@ -21,7 +22,10 @@
     "hdf5": {
       "description": "Check for HDF5 library",
       "dependencies": [
-        "hdf5"
+        {
+          "name": "hdf5",
+          "default-features": false
+        }
       ]
     },
     "mat73": {

diff --git a/ports/opencv4/portfile.cmake b/ports/opencv4/portfile.cmake
@@ -150,7 +150,7 @@ endif()
 # Build image quality module when building with 'contrib' feature and not UWP.
 set(BUILD_opencv_quality OFF)
 if("contrib" IN_LIST FEATURES)
-  if (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS)
+  if (VCPKG_TARGET_IS_UWP OR VCPKG_TARGET_IS_IOS OR (VCPKG_TARGET_ARCHITECTURE MATCHES "arm" AND VCPKG_TARGET_IS_WINDOWS))
     set(BUILD_opencv_quality OFF)
     message(WARNING "The image quality module (quality) does not build for UWP or iOS, the module has been disabled.")
     # The hdf module is silently disabled by OpenCVs buildsystem if HDF5 is not detected.
@@ -458,7 +458,6 @@ if (NOT VCPKG_BUILD_TYPE)
   )
 endif()
 
-if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   file(READ "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" OPENCV_MODULES)
   set(DEPS_STRING "include(CMakeFindDependencyMacro)
 if(${BUILD_opencv_dnn})
@@ -484,7 +483,7 @@ find_dependency(Threads)")
   if("cuda" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "\nfind_dependency(CUDA)")
   endif()
-  if(BUILD_opencv_quality)
+  if(BUILD_opencv_quality AND "contrib" IN_LIST FEATURES)
     string(APPEND DEPS_STRING "
 # C language is required for try_compile tests in FindHDF5
 enable_language(C)
@@ -556,7 +555,7 @@ find_dependency(Qt${USE_QT_VERSION} COMPONENTS OpenGL)")
 
   file(WRITE "${CURRENT_PACKAGES_DIR}/share/opencv4/OpenCVModules.cmake" "${OPENCV_MODULES}")
 
-
+if(VCPKG_LIBRARY_LINKAGE STREQUAL "static")
   file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin")
 endif()
 

diff --git a/ports/opencv4/vcpkg.json b/ports/opencv4/vcpkg.json
@@ -1,6 +1,7 @@
 {
   "name": "opencv4",
   "version": "4.7.0",
+  "port-version": 1,
   "description": "computer vision library",
   "homepage": "https://github.com/opencv/opencv",
   "license": "Apache-2.0",

diff --git a/ports/openimageio/portfile.cmake b/ports/openimageio/portfile.cmake
@@ -25,6 +25,8 @@ file(REMOVE
     "${SOURCE_PATH}/src/cmake/modules/FindOpenCV.cmake"
     "${SOURCE_PATH}/src/cmake/modules/FindOpenJPEG.cmake"
     "${SOURCE_PATH}/src/cmake/modules/FindWebP.cmake"
+    "${SOURCE_PATH}/src/cmake/modules/Findfmt.cmake"
+    "${SOURCE_PATH}/src/cmake/modules/FindTBB.cmake"
 )
 
 vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
@@ -64,6 +66,7 @@ vcpkg_cmake_configure(
         -DBUILD_DOCS=OFF
         -DINSTALL_DOCS=OFF
         -DENABLE_INSTALL_testtex=OFF
+        "-DFMT_INCLUDES=${CURRENT_INSTALLED_DIR}/include"
         "-DREQUIRED_DEPS=fmt;JPEG;Libheif;Libsquish;PNG;Robinmap"
     MAYBE_UNUSED_VARIABLES
         ENABLE_INSTALL_testtex

diff --git a/ports/openimageio/vcpkg.json b/ports/openimageio/vcpkg.json
@@ -1,7 +1,7 @@
 {
   "name": "openimageio",
   "version": "2.4.5.0",
-  "port-version": 1,
+  "port-version": 2,
   "description": "A library for reading and writing images, and a bunch of related classes, utilities, and application.",
   "homepage": "https://github.com/OpenImageIO/oiio",
   "license": "BSD-3-Clause",

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,58 +12,68 @@ 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,13 @@ 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 )
++else()
++  set(vtk_cmake_dir "${CMAKE_CURRENT_SOURCE_DIR}/VTK/CMake")
++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,67 @@ endif ()
 
  if (PARAVIEW_USE_EXTERNAL_VTK)
    if (paraview_required_modules OR paraview_unrecognized_modules)
 -    message(FATAL_ERROR
 -      "The following modules were requested or required, but not found: "
 -      "${paraview_required_modules};${paraview_unrecognized_modules}.")
-+    message(STATUS "REQUIRED:${paraview_required_modules}")
 +    foreach(mod ${paraview_required_modules})
 +        if(NOT TARGET ${mod})
-+            message(STATUS "REQUIRED TARGET not defined: ${mod}")
 +            list(APPEND modules_notarget ${mod})
 +        endif()
 +        if(${mod} MATCHES "VTK::") # For better debugging
-+            message(STATUS "VTK TARGET found: ${mod}")
 +            list(APPEND vtk_modules ${mod})
 +        endif()
 +    endforeach()
 +    foreach(mod ${paraview_unrecognized_modules})
 +        if(NOT TARGET ${mod})
-+            message(STATUS "UNREC TARGET not defined: ${mod}")
 +            list(FIND paraview_rejected_modules ${mod} _found_mod)
 +            if(_found_mod GREATER_EQUAL 0)
-+                message(STATUS "MODULE ${mod} not necessary; Removing from unrecognized")
 +                list(APPEND _to_remove ${mod})
 +            endif()
 +        else()
 +            list(APPEND _to_remove ${mod})
 +            #list(APPEND vtk_modules ${mod}) #probably do not need to add unrecognized_modules to the wrapper
 +        endif()
 +    endforeach()
-+    message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
 +    list(REMOVE_ITEM paraview_unrecognized_modules ${_to_remove})
++    message(STATUS "UNRECOGNIZED:${paraview_unrecognized_modules}")
 +    message(STATUS "REJECTED MODULES: ${paraview_rejected_modules}")
 +    message(STATUS "UNRECOGNIZED WITHOUT REJECTED AND KNOWN TARGETS: ${paraview_unrecognized_modules}")
 +    message(STATUS "ALL PROVIDED MODULES: ${paraview_modules}")
 +    set(_unnecessary_moduls ${paraview_modules})
 +    list(REMOVE_ITEM _unnecessary_moduls ${paraview_required_modules})
-+    message(STATUS "Unnecessary MODULES: ${_unnecessary_moduls}")
 +    if(modules_notarget)
 +        message(FATAL_ERROR
 +          "The following modules were requested or required, but not found: "
@@ -114,7 +112,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 +121,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 +131,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}