diff --git a/ports/cgns/portfile.cmake b/ports/cgns/portfile.cmake index e5d160980d1bc3..11bb824cca3c70 100644 --- 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 index 1161ad80815eed..ff701a98c55d0f 100644 --- 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 index bcd76519ccb80d..738c5690b1f0f8 100644 --- 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 index e40996aa5ca35d..196c2892742500 100644 --- 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 index 695befcdc98a7d..83457df599aacf 100644 --- 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 index afe8d70925ab40..45ada974a774fc 100644 --- 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 index c325999aaffaf8..33ca2f9cd58b6d 100644 --- 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 index 81af447e95440c..95eb1071ffda02 100644 --- 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 index 046d01bc855610..3f2a3febfa78c5 100644 --- 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 index 092081130caef1..1a158702289d37 100644 --- 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 index 9a941764cad60c..a965fff7e929fe 100644 --- 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 deleted file mode 100644 index e52802fbef3338..00000000000000 --- a/ports/paraview/catalyst_install.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/Clients/InSitu/CMakeLists.txt b/Clients/InSitu/CMakeLists.txt -index 159aa8ffc..f9bfc7dfe 100644 ---- a/Clients/InSitu/CMakeLists.txt -+++ b/Clients/InSitu/CMakeLists.txt -@@ -86,5 +86,5 @@ _vtk_module_apply_properties(catalyst) - # Update install locations - catalyst_library( - TARGET catalyst -- LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}" -+ #LIBRARY_DESTINATION "${_vtk_build_LIBRARY_DESTINATION}" - INSTALL_EXPORT_DEFAULT) -diff --git a/Remoting/Views/vtkGeometryRepresentationInternal.h b/Remoting/Views/vtkGeometryRepresentationInternal.h -index 86eb383af..cc204fba2 100644 ---- a/Remoting/Views/vtkGeometryRepresentationInternal.h -+++ b/Remoting/Views/vtkGeometryRepresentationInternal.h -@@ -22,7 +22,7 @@ - // serial backend. - #ifndef __VTK_WRAP__ - #if VTK_MODULE_ENABLE_VTK_vtkm --#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB -+//#include "vtkmConfigFilters.h" // for VTKM_ENABLE_TBB - #endif - - #if defined(VTKM_ENABLE_TBB) && VTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters diff --git a/ports/paraview/cgns.patch b/ports/paraview/cgns.patch deleted file mode 100644 index 2ebb05e1bd2ec2..00000000000000 --- a/ports/paraview/cgns.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMake/FindCGNS.cmake b/CMake/FindCGNS.cmake -index 005f1afd9..a45103a9f 100644 ---- a/CMake/FindCGNS.cmake -+++ b/CMake/FindCGNS.cmake -@@ -16,7 +16,7 @@ mark_as_advanced(CGNS_INCLUDE_DIR) - - find_library(CGNS_LIBRARY - NAMES -- cgns -+ cgnsdll cgns - DOC "CGNS library") - mark_as_advanced(CGNS_LIBRARY) - -@@ -45,4 +45,15 @@ if (CGNS_FOUND) - IMPORTED_LOCATION "${CGNS_LIBRARY}" - INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}") - endif () -+ include(CMakeFindDependencyMacro) -+ find_dependency(hdf5 CONFIG) -+ if(TARGET hdf5::hdf5-shared) -+ set_property(TARGET CGNS::CGNS APPEND PROPERTY -+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-shared") -+ elseif(TARGET hdf5::hdf5-static) -+ set_property(TARGET CGNS::CGNS APPEND PROPERTY -+ INTERFACE_LINK_LIBRARIES "hdf5::hdf5-static") -+ else() -+ message(FATAL_ERROR "No HDF5 target to link cgns against") -+ endif() - endif () diff --git a/ports/paraview/external_vtk.patch b/ports/paraview/external_vtk.patch index 0df160d6acb46f..20fa08f77fc0e0 100644 --- 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,43 +12,54 @@ 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() @@ -68,14 +67,13 @@ index 1af77d164..bebcb83ee 100644 + #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} diff --git a/ports/paraview/portfile.cmake b/ports/paraview/portfile.cmake index 46ea8b9a8915fe..e68bd513c6146d 100644 --- 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 91aaf338c62f77fccd7d197dea05e7a68035ab25 # v5.11.0 + SHA512 ddd72b127462a37dba220808925ab1991b3072ddd3f39ba7f26d260bd5abbaa6bd38a0c0181141f461df60dd718ec85df8c0faffff8e53a6cd1737b784565f4b 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,39 +33,42 @@ 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} ) +#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 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) + set(python_ver "") + if(NOT VCPKG_TARGET_IS_WINDOWS) + set(python_ver 3.10) + endif() list(APPEND ADDITIONAL_OPTIONS -DPython3_FIND_REGISTRY=NEVER - "-DPython3_EXECUTABLE:PATH=${PYTHON3}" # Required by more than one feature + "-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}" ) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() @@ -78,6 +76,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 @@ -85,7 +84,7 @@ vcpkg_cmake_configure( -DPARAVIEW_ENABLE_EMBEDDED_DOCUMENTATION:BOOL=OFF -DPARAVIEW_USE_QTHELP:BOOL=OFF - #A little bit of help in finding the boost headers + # A little bit of help in finding the boost headers "-DBoost_INCLUDE_DIR:PATH=${CURRENT_INSTALLED_DIR}/include" # Workarounds for CMake issues @@ -107,15 +106,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 +168,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 index ba62136a07e25b..cfeae223676d5b 100644 --- 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", diff --git a/ports/seacas/deps-and-shared.patch b/ports/seacas/deps-and-shared.patch new file mode 100644 index 00000000000000..32eb1c047b01bd --- /dev/null +++ b/ports/seacas/deps-and-shared.patch @@ -0,0 +1,820 @@ +diff --git a/cmake/TPLs/FindTPLHDF5.cmake b/cmake/TPLs/FindTPLHDF5.cmake +index 3799818f2..3e17b46ac 100644 +--- a/cmake/TPLs/FindTPLHDF5.cmake ++++ b/cmake/TPLs/FindTPLHDF5.cmake +@@ -55,7 +55,7 @@ + + find_package(HDF5 REQUIRED COMPONENTS C HL) + +-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES(HDF5 +- REQUIRED_HEADERS hdf5.h +- REQUIRED_LIBS_NAMES hdf5_hl hdf5 z +- ) ++tribits_extpkg_create_imported_all_libs_target_and_config_file( ++ HDF5 ++ INNER_FIND_PACKAGE_NAME HDF5 ++ IMPORTED_TARGETS_FOR_ALL_LIBS HDF5::HDF5 ) +diff --git a/cmake/TPLs/FindTPLMETIS.cmake b/cmake/TPLs/FindTPLMETIS.cmake +index 90911a3cc..bb57e3bf6 100644 +--- a/cmake/TPLs/FindTPLMETIS.cmake ++++ b/cmake/TPLs/FindTPLMETIS.cmake +@@ -53,8 +53,8 @@ + # ************************************************************************ + # @HEADER + +- +-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( METIS +- REQUIRED_HEADERS metis.h +- REQUIRED_LIBS_NAMES "metis" +- ) ++find_package(metis REQUIRED) ++tribits_extpkg_create_imported_all_libs_target_and_config_file( ++ METIS ++ INNER_FIND_PACKAGE_NAME metis ++ IMPORTED_TARGETS_FOR_ALL_LIBS metis ) +diff --git a/cmake/TPLs/FindTPLMatio.cmake b/cmake/TPLs/FindTPLMatio.cmake +index c76713ab9..f5b8bd702 100644 +--- a/cmake/TPLs/FindTPLMatio.cmake ++++ b/cmake/TPLs/FindTPLMatio.cmake +@@ -56,7 +56,7 @@ if (${CMAKE_VERSION} GREATER "3.13") + cmake_policy(SET CMP0074 NEW) + endif() + +-find_package(Matio REQUIRED) ++list(APPEND CMAKE_FIND_LIBRARY_PREFIXES lib) + TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Matio + REQUIRED_HEADERS matio.h + REQUIRED_LIBS_NAMES "matio") +diff --git a/cmake/TPLs/FindTPLNetcdf.cmake b/cmake/TPLs/FindTPLNetcdf.cmake +index 2c65d60bc..1a8bacf75 100644 +--- a/cmake/TPLs/FindTPLNetcdf.cmake ++++ b/cmake/TPLs/FindTPLNetcdf.cmake +@@ -55,7 +55,7 @@ + + + find_package(NetCDF REQUIRED) +-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Netcdf +- REQUIRED_HEADERS netcdf.h +- REQUIRED_LIBS_NAMES netcdf +- ) ++tribits_extpkg_create_imported_all_libs_target_and_config_file( ++ NetCDF ++ INNER_FIND_PACKAGE_NAME NetCDF ++ IMPORTED_TARGETS_FOR_ALL_LIBS NetCDF::NetCDF ) +diff --git a/cmake/TPLs/FindTPLZlib.cmake b/cmake/TPLs/FindTPLZlib.cmake +index cc607e9d8..069a37c23 100644 +--- a/cmake/TPLs/FindTPLZlib.cmake ++++ b/cmake/TPLs/FindTPLZlib.cmake +@@ -53,8 +53,8 @@ + # ************************************************************************ + # @HEADER + +- +-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( Zlib +- REQUIRED_HEADERS zlib.h +- REQUIRED_LIBS_NAMES z +- ) ++find_package(ZLIB REQUIRED) ++tribits_extpkg_create_imported_all_libs_target_and_config_file( ++ Zlib ++ INNER_FIND_PACKAGE_NAME ZLIB ++ IMPORTED_TARGETS_FOR_ALL_LIBS ZLIB::ZLIB ) +diff --git a/cmake/TPLs/FindTPLfmt.cmake b/cmake/TPLs/FindTPLfmt.cmake +index c6ec212f9..e38054d9a 100644 +--- a/cmake/TPLs/FindTPLfmt.cmake ++++ b/cmake/TPLs/FindTPLfmt.cmake +@@ -53,8 +53,8 @@ + # ************************************************************************ + # @HEADER + +- +-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( fmt +- REQUIRED_HEADERS fmt/format.h +- REQUIRED_LIBS_NAMES fmt +- ) ++find_package(fmt REQUIRED) ++tribits_extpkg_create_imported_all_libs_target_and_config_file( ++ fmt ++ INNER_FIND_PACKAGE_NAME fmt ++ IMPORTED_TARGETS_FOR_ALL_LIBS fmt::fmt ) +diff --git a/cmake/tribits/common_tpls/FindTPLCGNS.cmake b/cmake/tribits/common_tpls/FindTPLCGNS.cmake +index 37c329cd4..9d221f64f 100644 +--- a/cmake/tribits/common_tpls/FindTPLCGNS.cmake ++++ b/cmake/tribits/common_tpls/FindTPLCGNS.cmake +@@ -45,12 +45,12 @@ if ((CGNS_ALLOW_MODERN AND HDF5_FOUND_MODERN_CONFIG_FILE) OR CGNS_FORCE_MODERN) + print_var(CGNS_ALLOW_MODERN) + print_var(CGNS_FORCE_MODERN) + message("-- Using find_package(CGNS ${minimum_modern_CGNS_version} CONFIG) ...") +- find_package(CGNS ${minimum_modern_CGNS_version} CONFIG) ++ find_package(cgns CONFIG) + if (CGNS_FOUND) + message("-- Found CGNS_CONFIG=${CGNS_CONFIG}") + message("-- Generating CGNS::all_libs and CGNSConfig.cmake") + tribits_extpkg_create_imported_all_libs_target_and_config_file( + CGNS +- INNER_FIND_PACKAGE_NAME CGNS ++ INNER_FIND_PACKAGE_NAME cgns +- IMPORTED_TARGETS_FOR_ALL_LIBS CGNS::cgns) ++ IMPORTED_TARGETS_FOR_ALL_LIBS CGNS::CGNS) + set(TPL_CGNS_NOT_FOUND FALSE) + endif() +diff --git a/cmake/tribits/common_tpls/FindTPLHDF5.cmake b/cmake/tribits/common_tpls/FindTPLHDF5.cmake +index 716068c28..3d8fc8e76 100644 +--- a/cmake/tribits/common_tpls/FindTPLHDF5.cmake ++++ b/cmake/tribits/common_tpls/FindTPLHDF5.cmake +@@ -9,7 +9,7 @@ if (Netcdf_ALLOW_MODERN) + set(minimum_modern_HDF5_version 1.10.2) + print_var(Netcdf_ALLOW_MODERN) + message("-- Using find_package(HDF5 ${minimum_modern_HDF5_version} CONFIG) ...") +- find_package(HDF5 ${minimum_modern_HDF5_version} CONFIG) ++ find_package(HDF5) + if (HDF5_FOUND) + message("-- Found HDF5_CONFIG=${HDF5_CONFIG}") + message("-- Generating Netcdf::all_libs and NetcdfConfig.cmake") +@@ -17,7 +17,7 @@ if (Netcdf_ALLOW_MODERN) + tribits_extpkg_create_imported_all_libs_target_and_config_file( + HDF5 +- INNER_FIND_PACKAGE_NAME HDF5 ++ INNER_FIND_PACKAGE_NAME HDF5 +- IMPORTED_TARGETS_FOR_ALL_LIBS ${HDF5_EXPORT_LIBRARIES}) ++ IMPORTED_TARGETS_FOR_ALL_LIBS hdf5::hdf5) + set(HDF5_INTERNAL_IS_MODERN TRUE) + else() + message("-- Could not find HDF5_CONFIG (FindTPLHDF5.cmake)") +@@ -27,7 +27,7 @@ endif() + + set(HDF5_FOUND_MODERN_CONFIG_FILE ${HDF5_INTERNAL_IS_MODERN} CACHE INTERNAL "True if HDF5 was found by the modern method") + +-if (NOT TARGET HDF5::all_libs) ++if (0) + + # First, set up the variables for the (backward-compatible) TriBITS way of + # finding HDF5. These are used in case find_package(HDF5 ...) is not called +diff --git a/cmake/tribits/common_tpls/find_modules/FindCGNS.cmake b/cmake/tribits/common_tpls/find_modules/FindCGNS.cmake +index c2c98f4be..9626cdb92 100644 +--- a/cmake/tribits/common_tpls/find_modules/FindCGNS.cmake ++++ b/cmake/tribits/common_tpls/find_modules/FindCGNS.cmake +@@ -180,7 +180,7 @@ else(CGNS_LIBRARIES AND CGNS_INCLUDE_DIRS) + if (EXISTS "${CGNS_LIBRARY_DIR}") + + find_library(CGNS_LIBRARY +- NAMES cgns ++ NAMES cgnsdll cgns + HINTS ${CGNS_LIBRARY_DIR} + NO_DEFAULT_PATH) + +@@ -196,7 +196,7 @@ else(CGNS_LIBRARIES AND CGNS_INCLUDE_DIRS) + if (EXISTS "${CGNS_ROOT}" ) + + find_library(CGNS_LIBRARY +- NAMES cgns ++ NAMES cgnsdll cgns + HINTS ${CGNS_ROOT} + PATH_SUFFIXES "lib" "Lib" + NO_DEFAULT_PATH) +@@ -210,7 +210,7 @@ else(CGNS_LIBRARIES AND CGNS_INCLUDE_DIRS) + else() + + find_library(CGNS_LIBRARY +- NAMES cgns ++ NAMES cgnsdll cgns + PATH_SUFFIXES ${cgns_lib_suffixes}) + + endif() +diff --git a/cmake/tribits/common_tpls/find_modules/FindHDF5.cmake b/cmake/tribits/common_tpls/find_modules/FindHDF5-donotuse.cmake +similarity index 100% +rename from cmake/tribits/common_tpls/find_modules/FindHDF5.cmake +rename to cmake/tribits/common_tpls/find_modules/FindHDF5-donotuse.cmake +diff --git a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt +index ef391f1c6..a4869415b 100644 +--- a/packages/seacas/libraries/aprepro_lib/CMakeLists.txt ++++ b/packages/seacas/libraries/aprepro_lib/CMakeLists.txt +@@ -104,6 +104,10 @@ if (${CMAKE_PROJECT_NAME} STREQUAL "Seacas") + endif() + endif() + ++if(BUILD_SHARED_LIBS) ++ set_target_properties(aprepro_lib PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) ++endif() ++ + if (${PACKAGE_NAME}_ENABLE_TESTS) + TRIBITS_ADD_EXECUTABLE(aprepro_lib_test NOEXEPREFIX NOEXESUFFIX INSTALLABLE SOURCES apr_test.cc LINKER_LANGUAGE CXX) + +diff --git a/packages/seacas/libraries/chaco/CMakeLists.txt b/packages/seacas/libraries/chaco/CMakeLists.txt +index 5f43a4e0c..ff8570ce3 100644 +--- a/packages/seacas/libraries/chaco/CMakeLists.txt ++++ b/packages/seacas/libraries/chaco/CMakeLists.txt +@@ -56,5 +56,7 @@ TRIBITS_ADD_LIBRARY( + HEADERS ${HEADERS} + SOURCES ${SOURCES} + ) +- ++if(BUILD_SHARED_LIBS) ++ set_target_properties(chaco PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) ++endif() + TRIBITS_SUBPACKAGE_POSTPROCESS() +diff --git a/packages/seacas/libraries/exodus/CMakeLists.txt b/packages/seacas/libraries/exodus/CMakeLists.txt +index 2ed3ec4ab..f80f697f1 100644 +--- a/packages/seacas/libraries/exodus/CMakeLists.txt ++++ b/packages/seacas/libraries/exodus/CMakeLists.txt +@@ -1,5 +1,5 @@ + TRIBITS_SUBPACKAGE(Exodus) +- ++set(EXODUSII_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}" CACHE BOOL "") + if (SEACASExodus_ENABLE_STATIC) + INCLUDE(InstallSymLink) + endif() +@@ -46,6 +46,8 @@ if (SEACASExodus_ENABLE_SHARED) + set_property(TARGET exodus_shared PROPERTY C_STANDARD 99) + set_target_properties(exodus_shared PROPERTIES OUTPUT_NAME exodus) + INSTALL(TARGETS exodus_shared DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) ++ target_compile_definitions(exodus_shared PRIVATE exoIIc_EXPORTS) ++ target_compile_definitions(exodus PRIVATE exoIIc_EXPORTS) + endif() + endif() + +diff --git a/packages/seacas/libraries/exodus/cmake/exodus_config.h.in b/packages/seacas/libraries/exodus/cmake/exodus_config.h.in +index e4dcd51f2..a88254ab7 100644 +--- a/packages/seacas/libraries/exodus/cmake/exodus_config.h.in ++++ b/packages/seacas/libraries/exodus/cmake/exodus_config.h.in +@@ -4,4 +4,19 @@ + + @SEACAS_DEPRECATED_DECLARATIONS@ + ++#cmakedefine EXODUSII_BUILD_SHARED_LIBS ++#if defined(WIN32) || defined(__WIN32__) || defined(_WIN32) || defined(_MSC_VER) || \ ++ defined(__MINGW32__) || defined(_WIN64) || defined(__MINGW64__) ++#if defined(EXODUSII_BUILD_SHARED_LIBS) ++# if defined(exoIIc_EXPORTS) ++# define EXODUS_EXPORT __declspec( dllexport ) extern ++# else ++# define EXODUS_EXPORT __declspec( dllimport ) extern ++# endif ++#endif ++#else ++# define EXODUS_EXPORT extern ++#endif ++ ++ + #endif +diff --git a/packages/seacas/libraries/exodus/include/exodusII.h b/packages/seacas/libraries/exodus/include/exodusII.h +index ce636683a..5caa88f45 100644 +--- a/packages/seacas/libraries/exodus/include/exodusII.h ++++ b/packages/seacas/libraries/exodus/include/exodusII.h +@@ -715,7 +715,7 @@ ex_put_loadbal_param_cc(int exoid, /* NetCDF/Exodus file ID + ); + + /* Utility function to replace strncpy, strcpy -- guarantee null termination */ +-char *ex_copy_string(char *dest, char const *source, size_t elements); ++EXODUS_EXPORT char *ex_copy_string(char *dest, char const *source, size_t elements); + + /*! + * \addtogroup ModelDescription +diff --git a/packages/seacas/libraries/exodus/include/exodusII_int.h b/packages/seacas/libraries/exodus/include/exodusII_int.h +index cec2d7555..e2a21f8d4 100644 +--- a/packages/seacas/libraries/exodus/include/exodusII_int.h ++++ b/packages/seacas/libraries/exodus/include/exodusII_int.h +@@ -86,7 +86,7 @@ extern "C" { + #define EX_FILE_ID_MASK (0xffff0000) /**< Must match FILE_ID_MASK in NetCDF nc4internal.h */ + #define EX_GRP_ID_MASK (0x0000ffff) /**< Must match GRP_ID_MASK in NetCDF nc4internal.h */ + +-void ex__reset_error_status(void); ++EXODUS_EXPORT void ex__reset_error_status(void); + + #if defined(EXODUS_THREADSAFE) + #if !defined(exerrval) +@@ -791,9 +791,9 @@ extern struct ex__obj_stats *exoII_edm; + extern struct ex__obj_stats *exoII_fam; + extern struct ex__obj_stats *exoII_nm; + +-struct ex__file_item *ex__find_file_item(int exoid); +-struct ex__file_item *ex__add_file_item(int exoid); +-struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr); ++EXODUS_EXPORT struct ex__file_item *ex__find_file_item(int exoid); ++EXODUS_EXPORT struct ex__file_item *ex__add_file_item(int exoid); ++EXODUS_EXPORT struct ex__obj_stats *ex__get_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr); + + EXODUS_EXPORT void ex__rm_stat_ptr(int exoid, struct ex__obj_stats **obj_ptr); + +diff --git a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h +index e7323b8ec..ec974dbc8 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h ++++ b/packages/seacas/libraries/ioss/src/Ioss_StructuredBlock.h +@@ -81,7 +81,7 @@ namespace Ioss { + archive(m_bcName, m_famName, m_rangeBeg, m_rangeEnd, m_face); + } + +- friend std::ostream &operator<<(std::ostream &os, const BoundaryCondition &bc); ++ friend IOSS_EXPORT std::ostream &operator<<(std::ostream &os, const BoundaryCondition &bc); + + private: + bool equal_(const Ioss::BoundaryCondition &rhs, bool quiet) const; +diff --git a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h +index 015cc51d3..97bec74b0 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h ++++ b/packages/seacas/libraries/ioss/src/Ioss_ZoneConnectivity.h +@@ -86,7 +86,7 @@ namespace Ioss { + Ioss::IJK_t inverse_transform(const Ioss::IJK_t &index_1) const; + + std::vector get_range(int ordinal) const; +- friend std::ostream &operator<<(std::ostream &os, const ZoneConnectivity &zgc); ++ friend IOSS_EXPORT std::ostream &operator<<(std::ostream &os, const ZoneConnectivity &zgc); + + /* COMPARE two ZoneConnectivity objects */ + bool operator==(const Ioss::ZoneConnectivity &rhs) const; +diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C +index 872050daa..a3a0baf9f 100644 +--- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C ++++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.C +@@ -51,12 +51,6 @@ namespace Iotm { + initialize(); + } + +- TextMesh::TextMesh() +- { +- m_errorHandler = [](const std::ostringstream &errmsg) { error_handler(errmsg); }; +- initialize(); +- } +- + unsigned TextMesh::spatial_dimension() const { return m_data.spatialDim; } + + void TextMesh::initialize() +diff --git a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h +index 530b51e62..73ea2a5c6 100644 +--- a/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h ++++ b/packages/seacas/libraries/ioss/src/text_mesh/Iotm_TextMesh.h +@@ -58,7 +58,6 @@ namespace Iotm { + public: + explicit TextMesh(const std::string ¶meters, int proc_count = 1, int my_proc = 0); + TextMesh(int proc_count = 1, int my_proc = 0); +- TextMesh(); + TextMesh(const TextMesh &) = delete; + TextMesh &operator=(const TextMesh &) = delete; + +diff --git a/packages/seacas/libraries/nemesis/CMakeLists.txt b/packages/seacas/libraries/nemesis/CMakeLists.txt +index 154cf9e9e..ab5d87daa 100644 +--- a/packages/seacas/libraries/nemesis/CMakeLists.txt ++++ b/packages/seacas/libraries/nemesis/CMakeLists.txt +@@ -1,5 +1,5 @@ + TRIBITS_SUBPACKAGE(Nemesis) +- ++set(NEMESIS_BUILD_SHARED_LIBS "${BUILD_SHARED_LIBS}" CACHE BOOL "") + SET(NEMESIS_VERSION_MAJOR "5") + SET(NEMESIS_VERSION_MINOR "15") + SET(NEMESIS_VERSION_PATCH "0") +@@ -27,7 +27,7 @@ TRIBITS_ADD_LIBRARY( + HEADERS ${HEADERS} + SOURCES ${SOURCES} + ) +- ++target_compile_definitions(nemesis PRIVATE nemc_EXPORTS) + TRIBITS_ADD_EXECUTABLE_AND_TEST( + ne_ctest_wrap + NAME ne_ctest_wrap +diff --git a/packages/seacas/libraries/nemesis/ne_nemesisI.h b/packages/seacas/libraries/nemesis/ne_nemesisI.h +index dc78c2fe4..ae43c1f3f 100644 +--- a/packages/seacas/libraries/nemesis/ne_nemesisI.h ++++ b/packages/seacas/libraries/nemesis/ne_nemesisI.h +@@ -14,6 +14,8 @@ + #ifndef _NE_NEMESIS_H + #define _NE_NEMESIS_H + ++#include "nemesis_cfg.h" ++ + #ifdef __cplusplus + extern "C" { + #endif +@@ -34,24 +36,24 @@ typedef void void_int; + /*============================================================================= + * Initial Information Routines + *===========================================================================*/ +-extern int ne_get_init_info(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_get_init_info(int neid, /* NemesisI file ID */ + int * num_proc, /* Number of processors */ + int * num_proc_in_f, /* Number of procs in this file */ + char *ftype); + +-extern int ne_put_init_info(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_put_init_info(int neid, /* NemesisI file ID */ + int num_proc, /* Number of processors */ + int num_proc_in_f, /* Number of procs in this file */ + char *ftype); + +-extern int ne_get_init_global(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_get_init_global(int neid, /* NemesisI file ID */ + void_int *num_nodes_g, /* Number of global FEM nodes */ + void_int *num_elems_g, /* Number of global FEM elements */ + void_int *num_elem_blks_g, /* Number of global elem blocks */ + void_int *num_node_sets_g, /* Number of global node sets */ + void_int *num_side_sets_g /* Number of global side sets */ + ); +-extern int ne_put_init_global(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_put_init_global(int neid, /* NemesisI file ID */ + int64_t num_nodes_g, /* Number of global FEM nodes */ + int64_t num_elems_g, /* Number of global FEM elements */ + int64_t num_elem_blks_g, /* Number of global elem blocks */ +@@ -59,12 +61,12 @@ extern int ne_put_init_global(int neid, /* NemesisI file ID */ + int64_t num_side_sets_g /* Number of global side sets */ + ); + +-extern int ne_put_version(int neid); ++NEMESIS_EXPORT int ne_put_version(int neid); + + /*============================================================================= + * Loadbalance Parameter Routines + *===========================================================================*/ +-extern int ne_get_loadbal_param(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_loadbal_param(int neid, /* NetCDF/Exodus file ID */ + void_int *num_int_nodes, /* Number of internal FEM nodes */ + void_int *num_bor_nodes, /* Number of border FEM nodes */ + void_int *num_ext_nodes, /* Number of external FEM nodes */ +@@ -75,7 +77,7 @@ extern int ne_get_loadbal_param(int neid, /* NetCDF/Exodus file + int processor /* Processor ID */ + ); + +-extern int ne_put_loadbal_param(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_put_loadbal_param(int neid, /* NemesisI file ID */ + int64_t num_int_nodes, /* Number of internal FEM nodes */ + int64_t num_bor_nodes, /* Number of border FEM nodes */ + int64_t num_ext_nodes, /* Number of external FEM nodes */ +@@ -86,7 +88,7 @@ extern int ne_put_loadbal_param(int neid, /* NemesisI file ID */ + int processor /* Processor ID */ + ); + +-extern int ne_put_loadbal_param_cc(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_loadbal_param_cc(int neid, /* NetCDF/Exodus file ID */ + void_int *num_int_nodes, /* Number of internal node IDs */ + void_int *num_bor_nodes, /* Number of border node IDs */ + void_int *num_ext_nodes, /* Number of external node IDs */ +@@ -99,26 +101,26 @@ extern int ne_put_loadbal_param_cc(int neid, /* NetCDF/Exodus fi + /*============================================================================= + * NS, SS & EB Global Parameter Routines + *===========================================================================*/ +-extern int ne_get_ns_param_global(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_ns_param_global(int neid, /* NetCDF/Exodus file ID */ + void_int *ns_ids_glob, /* Global IDs of node sets */ + void_int *ns_n_cnt_glob, /* Count of nodes in node sets */ + void_int *ns_df_cnt_glob /* Count of dist. factors in ns */ + ); + +-extern int ++NEMESIS_EXPORT int + ne_put_ns_param_global(int neid, /* NemesisI file ID */ + void_int *global_ids, /* Vector of global node-set IDs */ + void_int *global_n_cnts, /* Vector of node counts in node-sets */ + void_int *global_df_cnts /* Vector of dist factor counts in node-sets */ + ); + +-extern int ne_get_ss_param_global(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_ss_param_global(int neid, /* NetCDF/Exodus file ID */ + void_int *ss_ids_glob, /* Global side-set IDs */ + void_int *ss_s_cnt_glob, /* Global side count */ + void_int *ss_df_cnt_glob /* Global dist. factor count */ + ); + +-extern int ne_put_ss_param_global(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_put_ss_param_global(int neid, /* NemesisI file ID */ + void_int *global_ids, /* Vector of global side-set IDs */ + void_int *global_el_cnts, /* Vector of element/side */ + /* counts in each side set */ +@@ -126,12 +128,12 @@ extern int ne_put_ss_param_global(int neid, /* NemesisI file ID + /* counts in each side set */ + ); + +-extern int ne_get_eb_info_global(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_get_eb_info_global(int neid, /* NemesisI file ID */ + void_int *el_blk_ids, /* Vector of global element IDs */ + void_int *el_blk_cnts /* Vector of global element counts */ + ); + +-extern int ne_put_eb_info_global(int neid, /* NemesisI file ID */ ++NEMESIS_EXPORT int ne_put_eb_info_global(int neid, /* NemesisI file ID */ + void_int *el_blk_ids, /* Vector of global element IDs */ + void_int *el_blk_cnts /* Vector of global element counts */ + ); +@@ -139,7 +141,7 @@ extern int ne_put_eb_info_global(int neid, /* NemesisI file ID */ + /*============================================================================= + * NS, SS & EB Subset Routines + *===========================================================================*/ +-extern int ne_get_n_side_set(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_side_set(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id side_set_id, /* Side-set ID to read */ + int64_t start_side_num, /* Starting element number */ + int64_t num_sides, /* Number of sides to read */ +@@ -147,7 +149,7 @@ extern int ne_get_n_side_set(int neid, /* NetCDF/Exodus f + void_int * side_set_side_list /* List of side IDs */ + ); + +-extern int ne_put_n_side_set(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_side_set(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id side_set_id, /* Side-set ID to write */ + int64_t start_side_num, /* Starting element number */ + int64_t num_sides, /* Number of sides to write */ +@@ -155,49 +157,49 @@ extern int ne_put_n_side_set(int neid, /* NetCDF/Exodu + const void_int *side_set_side_list /* List of side IDs */ + ); + +-extern int ne_get_n_side_set_df(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_side_set_df(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id side_set_id, /* Side-set ID */ + int64_t start_num, /* Starting df number */ + int64_t num_df_to_get, /* Number of df's to read */ + void * side_set_df /* Distribution factors */ + ); + +-extern int ne_put_n_side_set_df(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_side_set_df(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id side_set_id, /* Side-set ID */ + int64_t start_num, /* Starting df number */ + int64_t num_df_to_get, /* Number of df's to write */ + void * side_set_df /* Distribution factors */ + ); + +-extern int ne_get_n_node_set(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_node_set(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id node_set_id, /* Node set ID */ + int64_t start_node_num, /* Node index to start reading at */ + int64_t num_node, /* Number of nodes to read */ + void_int * node_set_node_list /* List of nodes in node set */ + ); + +-extern int ne_put_n_node_set(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_node_set(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id node_set_id, /* Node set ID */ + int64_t start_node_num, /* Node index to start writing at */ + int64_t num_node, /* Number of nodes to write */ + const void_int *node_set_node_list /* List of nodes in node set */ + ); + +-extern int ne_get_n_node_set_df(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_node_set_df(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id node_set_id, /* Node-set ID */ + int64_t start_num, /* Starting df number */ + int64_t num_df_to_get, /* Number of df's to read */ + void * node_set_df /* Distribution factors */ + ); + +-extern int ne_put_n_node_set_df(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_node_set_df(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id node_set_id, /* Node-set ID */ + int64_t start_num, /* Starting df number */ + int64_t num_df_to_get, /* Number of df's to write */ + void * node_set_df /* Distribution factors */ + ); + +-extern int ne_get_n_coord(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_coord(int neid, /* NetCDF/Exodus file ID */ + int64_t start_node_num, /* Starting position to read from */ + int64_t num_nodes, /* Number of coords to read */ + void * x_coor, /* Vector of X coordinates */ +@@ -205,7 +207,7 @@ extern int ne_get_n_coord(int neid, /* NetCDF/Exodus file ID */ + void * z_coor /* Vector of Z coordinates */ + ); + +-extern int ne_put_n_coord(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_coord(int neid, /* NetCDF/Exodus file ID */ + int64_t start_node_num, /* Starting position to write to */ + int64_t num_nodes, /* Number of coords to write */ + void * x_coor, /* Vector of X coordinates */ +@@ -213,35 +215,35 @@ extern int ne_put_n_coord(int neid, /* NetCDF/Exodus file ID */ + void * z_coor /* Vector of Z coordinates */ + ); + +-extern int ne_get_n_elem_conn(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_elem_conn(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id elem_blk_id, /* Element block ID */ + int64_t start_elem_num, /* Starting position to read from */ + int64_t num_elems, /* Number of elements to read */ + void_int * connect /* Connectivity vector */ + ); + +-extern int ne_put_n_elem_conn(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_elem_conn(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id elem_blk_id, /* Element block ID */ + int64_t start_elem_num, /* Starting position to write to */ + int64_t num_elems, /* Number of elements to write */ + const void_int *connect /* Connectivity vector */ + ); + +-extern int ne_get_n_elem_attr(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_elem_attr(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id elem_blk_id, /* Element block ID */ + int64_t start_elem_num, /* Starting position to read from */ + int64_t num_elems, /* Number of elements to read */ + void * attrib /* Attribute */ + ); + +-extern int ne_put_n_elem_attr(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_elem_attr(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id elem_blk_id, /* Element block ID */ + int64_t start_elem_num, /* Starting position to write to */ + int64_t num_elems, /* Number of elements to write */ + void * attrib /* Attribute */ + ); + +-extern int ne_get_elem_type(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_elem_type(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id elem_blk_id, /* Element block ID */ + char * elem_type /* The name of the element type */ + ); +@@ -249,7 +251,7 @@ extern int ne_get_elem_type(int neid, /* NetCDF/Exodus file ID * + /*============================================================================= + * Variable Routines + *===========================================================================*/ +-extern int ne_get_n_elem_var(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_elem_var(int neid, /* NetCDF/Exodus file ID */ + int time_step, /* time index */ + int elem_var_index, /* elemental variable index */ + ex_entity_id elem_blk_id, /* elemental block id */ +@@ -259,7 +261,7 @@ extern int ne_get_n_elem_var(int neid, /* NetCDF/Exodus fi + void * elem_var_vals /* variable values */ + ); + +-extern int ne_put_elem_var_slab(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_elem_var_slab(int neid, /* NetCDF/Exodus file ID */ + int time_step, /* time index */ + int elem_var_index, /* elemental variable index */ + ex_entity_id elem_blk_id, /* elemental block id */ +@@ -268,7 +270,7 @@ extern int ne_put_elem_var_slab(int neid, /* NetCDF/Exodus fi + void * elem_var_vals /* variable values */ + ); + +-extern int ne_get_n_nodal_var(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_nodal_var(int neid, /* NetCDF/Exodus file ID */ + int time_step, /* whole time step number */ + int nodal_var_index, /* index of desired nodal var */ + int64_t start_node_num, /* starting node number */ +@@ -276,7 +278,7 @@ extern int ne_get_n_nodal_var(int neid, /* NetCDF/Exodus file ID + void * nodal_vars /* array of nodal var values */ + ); + +-extern int ne_put_nodal_var_slab(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_nodal_var_slab(int neid, /* NetCDF/Exodus file ID */ + int time_step, /* The time step index */ + int nodal_var_index, /* Nodal variable index */ + int64_t start_pos, /* Start position for write */ +@@ -287,51 +289,51 @@ extern int ne_put_nodal_var_slab(int neid, /* NetCDF/Exodus file + /*============================================================================= + * Number Map Routines + *===========================================================================*/ +-extern int ne_get_n_elem_num_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_elem_num_map(int neid, /* NetCDF/Exodus file ID */ + int64_t start_ent, /* Starting position to read from */ + int64_t num_ents, /* Number of elements to read */ + void_int *elem_map /* element map numbers */ + ); + +-extern int ne_put_n_elem_num_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_elem_num_map(int neid, /* NetCDF/Exodus file ID */ + int64_t start_ent, /* Starting position to read from */ + int64_t num_ents, /* Number of elements to read */ + const void_int *elem_map /* element map numbers */ + ); + +-extern int ne_get_n_node_num_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_n_node_num_map(int neid, /* NetCDF/Exodus file ID */ + int64_t start_ent, /* starting node number */ + int64_t num_ents, /* number of nodes to read */ + void_int *node_map /* vector for node map */ + ); + +-extern int ne_put_n_node_num_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_n_node_num_map(int neid, /* NetCDF/Exodus file ID */ + int64_t start_ent, /* starting node number */ + int64_t num_ents, /* number of nodes to read */ + const void_int *node_map /* vector for node map */ + ); + +-extern int ne_get_node_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_node_map(int neid, /* NetCDF/Exodus file ID */ + void_int *node_mapi, /* Internal FEM node IDs */ + void_int *node_mapb, /* Border FEM node IDs */ + void_int *node_mape, /* External FEM node IDs */ + int processor /* Processor IDs */ + ); + +-extern int ne_put_node_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_node_map(int neid, /* NetCDF/Exodus file ID */ + void_int *node_mapi, /* Internal FEM node IDs */ + void_int *node_mapb, /* Border FEM node IDs */ + void_int *node_mape, /* External FEM node IDs */ + int processor /* This processor ID */ + ); + +-extern int ne_get_elem_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_elem_map(int neid, /* NetCDF/Exodus file ID */ + void_int *elem_mapi, /* Internal element IDs */ + void_int *elem_mapb, /* Border element IDs */ + int processor /* Processor ID */ + ); + +-extern int ne_put_elem_map(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_elem_map(int neid, /* NetCDF/Exodus file ID */ + void_int *elem_mapi, /* Internal FEM element IDs */ + void_int *elem_mapb, /* Border FEM element IDs */ + int processor /* This processor ID */ +@@ -341,7 +343,7 @@ extern int ne_put_elem_map(int neid, /* NetCDF/Exodus file ID */ + * Communications Maps Routines + *===========================================================================*/ + +-extern int ne_get_cmap_params(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_cmap_params(int neid, /* NetCDF/Exodus file ID */ + void_int *node_cmap_ids, /* Nodal comm. map IDs */ + void_int *node_cmap_node_cnts, /* Number of nodes in each map */ + void_int *elem_cmap_ids, /* Elemental comm. map IDs */ +@@ -349,7 +351,7 @@ extern int ne_get_cmap_params(int neid, /* NetCDF/Exodus fi + int processor /* This processor ID */ + ); + +-extern int ne_put_cmap_params(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_cmap_params(int neid, /* NetCDF/Exodus file ID */ + void_int *node_map_ids, /* Node map IDs */ + void_int *node_map_node_cnts, /* Nodes in nodal comm */ + void_int *elem_map_ids, /* Elem map IDs */ +@@ -357,7 +359,7 @@ extern int ne_put_cmap_params(int neid, /* NetCDF/Exodus fil + int64_t processor /* This processor ID */ + ); + +-extern int ne_put_cmap_params_cc(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_cmap_params_cc(int neid, /* NetCDF/Exodus file ID */ + void_int *node_map_ids, /* Node map IDs */ + void_int *node_map_node_cnts, /* Nodes in nodal comm */ + void_int *node_proc_ptrs, /* Pointer into array for */ +@@ -368,21 +370,21 @@ extern int ne_put_cmap_params_cc(int neid, /* NetCDF/Exodus + /* elem maps */ + ); + +-extern int ne_get_node_cmap(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_node_cmap(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id map_id, /* Map ID */ + void_int * node_ids, /* FEM node IDs */ + void_int * proc_ids, /* Processor IDs */ + int processor /* This processor ID */ + ); + +-extern int ne_put_node_cmap(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_node_cmap(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id map_id, /* Nodal comm map ID */ + void_int * node_ids, /* FEM node IDs */ + void_int * proc_ids, /* Processor IDs */ + int processor /* This processor ID */ + ); + +-extern int ne_get_elem_cmap(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_get_elem_cmap(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id map_id, /* Elemental comm map ID */ + void_int * elem_ids, /* Element IDs */ + void_int * side_ids, /* Element side IDs */ +@@ -390,7 +392,7 @@ extern int ne_get_elem_cmap(int neid, /* NetCDF/Exodus file ID */ + int processor /* This processor ID */ + ); + +-extern int ne_put_elem_cmap(int neid, /* NetCDF/Exodus file ID */ ++NEMESIS_EXPORT int ne_put_elem_cmap(int neid, /* NetCDF/Exodus file ID */ + ex_entity_id map_id, /* Elemental comm map ID */ + void_int * elem_ids, /* Vector of element IDs */ + void_int * side_ids, /* Vector of side IDs */ +diff --git a/packages/seacas/libraries/nemesis/nemesis_cfg.h.in b/packages/seacas/libraries/nemesis/nemesis_cfg.h.in +index 37b04f5cd..05f2db341 100644 +--- a/packages/seacas/libraries/nemesis/nemesis_cfg.h.in ++++ b/packages/seacas/libraries/nemesis/nemesis_cfg.h.in +@@ -1,8 +1,8 @@ +-# Copyright(C) 1999-2020 National Technology & Engineering Solutions +-# of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with +-# NTESS, the U.S. Government retains certain rights in this software. +-# +-# See packages/seacas/LICENSE for details ++// Copyright(C) 1999-2020 National Technology & Engineering Solutions ++// of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with ++// NTESS, the U.S. Government retains certain rights in this software. ++// ++// See packages/seacas/LICENSE for details + + #ifndef __nemesis_cfg_h + #define __nemesis_cfg_h +diff --git a/packages/seacas/libraries/suplib_c/CMakeLists.txt b/packages/seacas/libraries/suplib_c/CMakeLists.txt +index c5c0d0fd3..b047ea4cd 100644 +--- a/packages/seacas/libraries/suplib_c/CMakeLists.txt ++++ b/packages/seacas/libraries/suplib_c/CMakeLists.txt +@@ -29,5 +29,7 @@ TRIBITS_ADD_LIBRARY( + NOINSTALLHEADERS + SOURCES ${SOURCES} + ) +- ++if(BUILD_SHARED_LIBS) ++ set_target_properties(suplib_c PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) ++endif() + TRIBITS_SUBPACKAGE_POSTPROCESS() +diff --git a/packages/seacas/libraries/suplib_cpp/CMakeLists.txt b/packages/seacas/libraries/suplib_cpp/CMakeLists.txt +index 5eb15b5a7..640b2a8b9 100644 +--- a/packages/seacas/libraries/suplib_cpp/CMakeLists.txt ++++ b/packages/seacas/libraries/suplib_cpp/CMakeLists.txt +@@ -30,5 +30,7 @@ TRIBITS_ADD_LIBRARY( + NOINSTALLHEADERS + SOURCES ${SOURCES} + ) +- ++if(BUILD_SHARED_LIBS) ++ set_target_properties(suplib_cpp PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS ON) ++endif() + TRIBITS_SUBPACKAGE_POSTPROCESS() diff --git a/ports/seacas/fix-ioss-includes.patch b/ports/seacas/fix-ioss-includes.patch new file mode 100644 index 00000000000000..941cd6f844e749 --- /dev/null +++ b/ports/seacas/fix-ioss-includes.patch @@ -0,0 +1,25 @@ +diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +index eab77e9a1..6cec47422 100644 +--- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C ++++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.C +@@ -14,6 +14,8 @@ + #include + #include + #include ++#include ++#include + #include + + #include // for lower_bound, copy, etc +diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +index 0be442435..fccf2d4d4 100644 +--- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C ++++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.C +@@ -74,6 +74,7 @@ + #include + #include + #include ++#include + + #include + #undef MPICPP diff --git a/ports/seacas/fix-mpi.patch b/ports/seacas/fix-mpi.patch new file mode 100644 index 00000000000000..32c4a99fd97ec8 --- /dev/null +++ b/ports/seacas/fix-mpi.patch @@ -0,0 +1,85 @@ +diff --git a/cmake/TPLs/FindTPLParMETIS.cmake b/cmake/TPLs/FindTPLParMETIS.cmake +index 2dc2c149d..9bc04ae82 100644 +--- a/cmake/TPLs/FindTPLParMETIS.cmake ++++ b/cmake/TPLs/FindTPLParMETIS.cmake +@@ -54,7 +54,8 @@ + # @HEADER + + +-TRIBITS_TPL_FIND_INCLUDE_DIRS_AND_LIBRARIES( ParMETIS +- REQUIRED_HEADERS parmetis.h +- REQUIRED_LIBS_NAMES "parmetis;metis" +- ) ++find_package(parmetis REQUIRED) ++tribits_extpkg_create_imported_all_libs_target_and_config_file( ++ ParMETIS ++ INNER_FIND_PACKAGE_NAME parmetis ++ IMPORTED_TARGETS_FOR_ALL_LIBS parmetis ) +diff --git a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h +index f53f140a7..c2df7a802 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h ++++ b/packages/seacas/libraries/ioss/src/Ioss_Decomposition.h +@@ -91,6 +91,8 @@ namespace Ioss { + SetDecompositionData() = default; + SetDecompositionData(const SetDecompositionData &) = delete; + SetDecompositionData(SetDecompositionData &&) = default; ++ SetDecompositionData &operator =(const SetDecompositionData &) = delete; ++ SetDecompositionData &operator =(SetDecompositionData &&) = default; + + ~SetDecompositionData() + { +diff --git a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C +index a82d6ca14..c5e80f692 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C ++++ b/packages/seacas/libraries/ioss/src/Ioss_ParallelUtils.C +@@ -419,7 +419,7 @@ template IOSS_EXPORT void Ioss::ParallelUtils::broadcast(int &value, int) const; + /// \relates Ioss::ParallelUtils::broadcast + template IOSS_EXPORT void Ioss::ParallelUtils::broadcast(int64_t &value, int) const; + +-template <> void Ioss::ParallelUtils::broadcast(std::string &my_str, int root) const ++template <> IOSS_EXPORT void Ioss::ParallelUtils::broadcast(std::string &my_str, int root) const + { + PAR_UNUSED(my_str); + PAR_UNUSED(root); +diff --git a/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h b/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h +index cfdad81d9..1a785161e 100644 +--- a/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h ++++ b/packages/seacas/libraries/ioss/src/Ioss_ScopeGuard.h +@@ -27,7 +27,7 @@ public: + + template inline RefHolder ByRef(T &t) { return RefHolder(t); } + +-class IOSS_EXPORT ScopeGuardImplBase ++class ScopeGuardImplBase + { + ScopeGuardImplBase &operator=(const ScopeGuardImplBase &) = delete; + +diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h +index 359c1e9fd..e4c2dff9e 100644 +--- a/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h ++++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_DecompositionData.h +@@ -34,7 +34,11 @@ namespace Ioex { + class IOEX_EXPORT DecompositionDataBase + { + public: +- DecompositionDataBase(Ioss_MPI_Comm comm) : comm_(comm) {} ++ explicit DecompositionDataBase(Ioss_MPI_Comm comm) : comm_(comm) {}; ++ DecompositionDataBase(const DecompositionDataBase &) = delete; ++ DecompositionDataBase(DecompositionDataBase &&) = delete; ++ DecompositionDataBase &operator =(const DecompositionDataBase &) = delete; ++ DecompositionDataBase &operator =(DecompositionDataBase &&) = delete; + + virtual ~DecompositionDataBase() = default; + virtual int int_size() const = 0; +diff --git a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +index f2785e37f..df0c8fbf6 100644 +--- a/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h ++++ b/packages/seacas/libraries/ioss/src/exodus/Ioex_ParallelDatabaseIO.h +@@ -16,6 +16,7 @@ + #include // for Map + #include // for State + #include // for DatabaseIO ++#include + #include // for less + #include // for map, map<>::value_compare + #include diff --git a/ports/seacas/fix_tpl_libs.patch b/ports/seacas/fix_tpl_libs.patch new file mode 100644 index 00000000000000..c0427658c351a1 --- /dev/null +++ b/ports/seacas/fix_tpl_libs.patch @@ -0,0 +1,288 @@ +diff --git a/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake b/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake +index f08e7b78b..1274e8fce 100644 +--- a/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake ++++ b/cmake/tribits/core/package_arch/TribitsAddExecutable.cmake +@@ -419,7 +419,11 @@ function(tribits_add_executable EXE_NAME) + foreach(depPkg IN LISTS ${PACKAGE_NAME}_LIB_ENABLED_DEPENDENCIES + ${PACKAGE_NAME}_TEST_ENABLED_DEPENDENCIES + ) +- target_link_libraries(${EXE_BINARY_NAME} PUBLIC ${depPkg}::all_libs) ++ if(TARGET TPL::${depPkg}::all_libs) ++ target_link_libraries(${EXE_BINARY_NAME} PUBLIC TPL::${depPkg}::all_libs) ++ else() ++ target_link_libraries(${EXE_BINARY_NAME} PUBLIC ${depPkg}::all_libs) ++ endif() + endforeach() + foreach(testOnlyLib ${PARSE_TESTONLYLIBS}) + target_link_libraries(${EXE_BINARY_NAME} PUBLIC +diff --git a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake +index 4bac9f943..398002e33 100644 +--- a/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake ++++ b/cmake/tribits/core/package_arch/TribitsAddLibrary.cmake +@@ -468,7 +468,11 @@ function(tribits_add_library LIBRARY_NAME_IN) + target_link_libraries(${LIBRARY_NAME} PUBLIC ${${PACKAGE_NAME}_LIBRARIES}) + # ${PACKAGE_NAME}_LIB_ENABLED_DEPENDENCIES + foreach(depPkg IN LISTS ${PACKAGE_NAME}_LIB_ENABLED_DEPENDENCIES) +- target_link_libraries(${LIBRARY_NAME} PUBLIC ${depPkg}::all_libs) ++ if(TARGET TPL::${depPkg}::all_libs) ++ target_link_libraries(${LIBRARY_NAME} PUBLIC TPL::${depPkg}::all_libs) ++ else() ++ target_link_libraries(${LIBRARY_NAME} PUBLIC ${depPkg}::all_libs) ++ endif() + endforeach() + # ${PACKAGE_NAME}_TEST_ENABLED_DEPENDENCIES (TESTONLY lib) + if (PARSE_TESTONLY) +diff --git a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +index 2d041a2ca..c49a2c019 100644 +--- a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake ++++ b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +@@ -132,7 +132,7 @@ endfunction() + function(tribits_extpkg_install_config_file tplName tplConfigFile) + install( + FILES "${tplConfigFile}" +- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/external_packages/${tplName}" ++ DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/external_packages/TPL-Seacas-${tplName}" + ) + endfunction() + +@@ -159,7 +159,7 @@ function(tribits_extpkg_install_config_version_file tplName + ) + install( + FILES "${tplConfigVersionFile}" +- DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/external_packages/${tplName}" ++ DESTINATION "${${PROJECT_NAME}_INSTALL_LIB_DIR}/external_packages/TPL-Seacas-${tplName}" + ) + endfunction() + +@@ -258,7 +258,7 @@ function(tribits_extpkg_write_config_file_str tplName tplConfigFileStrOut) + "# Generated by CMake, do not edit!\n" + "\n" + "# Guard against multiple inclusion\n" +- "if (TARGET ${tplName}::all_libs)\n" ++ "if (TARGET TPL::${tplName}::all_libs)\n" + " return()\n" + "endif()\n" + "\n" +@@ -333,9 +333,9 @@ function(tribits_extpkg_add_find_upstream_dependencies_str + message(FATAL_ERROR "ERROR: ${upstreamTplDepName}_DIR is empty!") + endif() + string(APPEND configFileFragStr +- "if (NOT TARGET ${upstreamTplDepName}::all_libs)\n" ++ "if (NOT TARGET TPL::${upstreamTplDepName}::all_libs)\n" + " set(${upstreamTplDepName}_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../${upstreamTplDepName}\")\n" +- " find_dependency(${upstreamTplDepName} REQUIRED CONFIG \${${tplName}_SearchNoOtherPathsArgs})\n" ++ " find_dependency(TPL-Seacas-${upstreamTplDepName} REQUIRED CONFIG \${${tplName}_SearchNoOtherPathsArgs})\n" + " unset(${upstreamTplDepName}_DIR)\n" + "endif()\n" + "\n" +@@ -440,6 +440,7 @@ function(tribits_extpkg_process_libraries_list tplName) + elseif (libEntryType STREQUAL "GENERAL_LINK_OPTION") + message_wrapper("-- NOTE: Moving the general link argument '${libentry}' in TPL_${tplName}_LIBRARIES forward on the link line which may change the link and break the link!") + list(APPEND libLinkFlagsList "${libentry}") ++ elseif(libEntryType STREQUAL "TARGET_NAME") + else() + tribits_extpkg_process_libraries_list_library_entry( + ${tplName} "${libentry}" ${libEntryType} libTargets lastLibProcessed +@@ -501,6 +501,8 @@ function(tribits_tpl_libraries_entry_type libentry libEntryTypeOut) + set(libEntryType FULL_LIB_PATH) + elseif (libentry MATCHES "^[a-zA-Z_][a-zA-Z0-9_-]*$") + set(libEntryType LIB_NAME) ++ elseif (TARGET "${libentry}") ++ set(libEntryType TARGET_NAME) + else() + set(libEntryType UNSUPPORTED_LIB_ENTRY) + endif() +@@ -529,7 +531,7 @@ function(tribits_extpkg_process_libraries_list_library_entry + tribits_extpkg_get_libname_and_path_from_libentry( + "${libentry}" ${libEntryType} libname libpath) + # Create IMPORTED library target +- set(prefixed_libname "${tplName}::${libname}") ++ set(prefixed_libname "TPL::${tplName}::${libname}") + if (NOT (prefixed_libname IN_LIST libTargets)) + tribits_extpkg_append_add_library_str (${libname} ${prefixed_libname} + ${libEntryType} "${libpath}" configFileStr) +@@ -571,6 +573,9 @@ function(tribits_extpkg_get_libname_and_path_from_libentry + elseif (libEntryType STREQUAL "LIB_NAME") + set(libname "${libentry}") + set(libpath "") ++ elseif (libEntryType STREQUAL "TARGET_NAME") ++ string(REGEX REPLACE "([^:]*::)+" "" libname "${libentry}") ++ set(libpath "") + else() + message(FATAL_ERROR "Error libEntryType='${libEntryType}' not supported here!") + endif() +@@ -605,6 +610,13 @@ function(tribits_extpkg_append_add_library_str + "set_target_properties(${prefixed_libname} PROPERTIES\n" + " IMPORTED_LIBNAME \"${libname}\")\n" + ) ++ elseif (libEntryType STREQUAL "TARGET_NAME") ++ string(REGEX REPLACE "([^:]*::)+" "" package_name "${libname}") ++ string(APPEND configFileStr ++ "#add_library(${prefixed_libname} IMPORTED INTERFACE)\n" ++ "#find_package(${package_name} REQUIRED)\n" ++ "#target_link_libraries(${prefixed_libname} INTERFACE ${libentry})\n" ++ ) + else() + message(FATAL_ERROR "Error libEntryType='${libEntryType}' not supported here!") + endif() +@@ -784,11 +796,11 @@ function(tribits_extpkg_create_all_libs_target tplName) + + # add_library() + string(APPEND configFileStr +- "add_library(${tplName}::all_libs INTERFACE IMPORTED)\n") ++ "add_library(TPL::${tplName}::all_libs INTERFACE IMPORTED)\n") + # target_link_libraries() + if (libTargets) + string(APPEND configFileStr +- "target_link_libraries(${tplName}::all_libs\n") ++ "target_link_libraries(TPL::${tplName}::all_libs\n") + foreach (libTarget IN LISTS libTargets) + string(APPEND configFileStr + " INTERFACE ${libTarget}\n") +@@ -799,7 +811,7 @@ function(tribits_extpkg_create_all_libs_target tplName) + # target_include_directories() + if (TPL_${tplName}_INCLUDE_DIRS) + string(APPEND configFileStr +- "target_include_directories(${tplName}::all_libs SYSTEM\n") ++ "target_include_directories(TPL::${tplName}::all_libs SYSTEM\n") + foreach (inclDir IN LISTS TPL_${tplName}_INCLUDE_DIRS) + string(APPEND configFileStr + " INTERFACE \"${inclDir}\"\n") +@@ -810,7 +822,7 @@ function(tribits_extpkg_create_all_libs_target tplName) + # target_link_options() + if (libLinkFlags) + string(APPEND configFileStr +- "target_link_options(${tplName}::all_libs\n") ++ "target_link_options(TPL::${tplName}::all_libs\n") + foreach (likLinkFlag IN LISTS libLinkFlags) + string(APPEND configFileStr + " INTERFACE \"${likLinkFlag}\"\n") +diff --git a/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake b/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake +index dcdde4ce6..aaec95d49 100644 +--- a/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake ++++ b/cmake/tribits/core/package_arch/TribitsProcessEnabledTpl.cmake +@@ -154,9 +154,9 @@ function(tribits_process_enabled_tpl TPL_NAME) + set(buildDirExternalPkgsDir + "${${PROJECT_NAME}_BINARY_DIR}/${${PROJECT_NAME}_BUILD_DIR_EXTERNAL_PKGS_DIR}") + set(tplConfigFile +- "${buildDirExternalPkgsDir}/${TPL_NAME}/${TPL_NAME}Config.cmake") ++ "${buildDirExternalPkgsDir}/TPL-Seacas-${TPL_NAME}/TPL-Seacas-${TPL_NAME}Config.cmake") + set(tplConfigVersionFile +- "${buildDirExternalPkgsDir}/${TPL_NAME}/${TPL_NAME}ConfigVersion.cmake") ++ "${buildDirExternalPkgsDir}/TPL-Seacas-${TPL_NAME}/TPL-Seacas-${TPL_NAME}ConfigVersion.cmake") + tribits_extpkg_write_config_version_file(${TPL_NAME} + "${tplConfigVersionFile}") + tribits_extpkg_install_config_file(${TPL_NAME} "${tplConfigFile}") +diff --git a/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake b/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake +index d3cb102cf..3641799ac 100644 +--- a/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake ++++ b/cmake/tribits/core/package_arch/TribitsTplFindIncludeDirsAndLibraries.cmake +@@ -423,9 +423,7 @@ function(tribits_tpl_find_include_dirs_and_libraries TPL_NAME) + set(TPL_CMAKE_FIND_LIBRARY_SUFFIXES ${TPL_CMAKE_FIND_LIBRARY_SUFFIXES_DEFAULT}) + else() + if (WIN32) +- set(CMAKE_FIND_LIBRARY_SUFFIXES .lib .a) + else() +- set(CMAKE_FIND_LIBRARY_SUFFIXES .a ) + endif() + endif() + #print_var(CMAKE_FIND_LIBRARY_SUFFIXES) +@@ -717,7 +717,7 @@ function(tribits_tpl_find_include_dirs_and_libraries TPL_NAME) + set(buildDirExternalPkgsDir + "${${PROJECT_NAME}_BINARY_DIR}/${${PROJECT_NAME}_BUILD_DIR_EXTERNAL_PKGS_DIR}") +- set(tplConfigFileBaseDir "${buildDirExternalPkgsDir}/${TPL_NAME}") ++ set(tplConfigFileBaseDir "${buildDirExternalPkgsDir}/TPL-Seacas-${TPL_NAME}") +- set(tplConfigFile "${tplConfigFileBaseDir}/${TPL_NAME}Config.cmake") ++ set(tplConfigFile "${tplConfigFileBaseDir}/TPL-Seacas-${TPL_NAME}Config.cmake") + tribits_extpkg_write_config_file(${TPL_NAME} "${tplConfigFile}") + if (NOT ${PROJECT_NAME}_ENABLE_INSTALLATION_TESTING) + include("${tplConfigFile}") +diff --git a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake +index 1f31b6ec0..9bc1057b7 100644 +--- a/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake ++++ b/cmake/tribits/core/package_arch/TribitsWriteClientExportFiles.cmake +@@ -289,7 +289,11 @@ function(tribits_write_flexible_package_client_export_files) + + set(${PACKAGE_NAME}_TPL_LIBRARIES "") + foreach(TPL ${ORDERED_FULL_TPL_SET}) +- list(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL}::all_libs) ++ if(TARGET TPL::${TPL}::all_libs) ++ list(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES TPL::${TPL}::all_libs) ++ else() ++ list(APPEND ${PACKAGE_NAME}_TPL_LIBRARIES ${TPL}::all_libs) ++ endif() + endforeach() + + # Generate a note discouraging editing of the Config.cmake file +@@ -587,17 +591,21 @@ function(tribits_append_dependent_package_config_file_includes_and_enables packa + "\n# Include configuration of dependent packages\n") + foreach(depPkg IN LISTS ${packageName}_LIB_ENABLED_DEPENDENCIES) + set(packageConfigBaseDir "") # Initially, no add include() ++ set(packageTarget "${depPkg}::all_libs") ++ set(packageConfig "${depPkg}Config.cmake") + if (${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "INTERNAL") + set(packageConfigBaseDir "${pkgConfigFileBaseDir}/${depPkg}") + elseif (${depPkg}_PACKAGE_BUILD_STATUS STREQUAL "EXTERNAL") +- set(packageConfigBaseDir "${extPkgConfigFileBaseDir}/${depPkg}") ++ set(packageConfigBaseDir "${extPkgConfigFileBaseDir}/TPL-Seacas-${depPkg}") ++ set(packageTarget "TPL::${depPkg}::all_libs") ++ set(packageConfig "TPL-Seacas-${depPkg}Config.cmake") + else() + message(FATAL_ERROR "ERROR: ${depPkg}_PACKAGE_BUILD_STATUS='${${depPkg}_PACKAGE_BUILD_STATUS}' invalid!") + endif() + if (packageConfigBaseDir) + string(APPEND configFileStr +- "if (NOT TARGET ${depPkg}::all_libs)\n" +- " include(\"${packageConfigBaseDir}/${depPkg}Config.cmake\")\n" ++ "if (NOT TARGET ${packageTarget})\n" ++ " include(\"${packageConfigBaseDir}/${packageConfig}\")\n" + "endif()\n" + ) + endif() +diff --git a/cmake/tribits/core/package_arch/TribitsExternalPackageFindTplHelpers.cmake b/cmake/tribits/core/package_arch/TribitsExternalPackageFindTplHelpers.cmake +index 1873267bd..ed6254632 100644 +--- a/cmake/tribits/core/package_arch/TribitsExternalPackageFindTplHelpers.cmake ++++ b/cmake/tribits/core/package_arch/TribitsExternalPackageFindTplHelpers.cmake +@@ -120,17 +120,21 @@ function(tribits_extpkg_create_package_config_file_with_imported_targets + "set(${externalPkg}_DIR \"${${externalPkg}_DIR}\")\n" ) + endif() + string(APPEND configFileStr +- "find_dependency(${externalPkg})\n" +- "add_library(${tplName}::all_libs INTERFACE IMPORTED GLOBAL)\n" ++ "find_dependency(${externalPkg})\n" # This is outside TPL ++ "if(NOT TARGET ${tplName}::all_libs)\n" ++ " add_library(${tplName}::all_libs INTERFACE IMPORTED GLOBAL)\n" + ) + foreach (importedTarget IN LISTS PARSE_IMPORTED_TARGETS_FOR_ALL_LIBS) + string(APPEND configFileStr +- "target_link_libraries(${tplName}::all_libs INTERFACE ${importedTarget})\n") ++ " target_link_libraries(${tplName}::all_libs INTERFACE ${importedTarget})\n") + endforeach() ++ string(APPEND configFileStr ++ "endif()\n" ++ ) + set(buildDirExternalPkgsDir + "${${PROJECT_NAME}_BINARY_DIR}/${${PROJECT_NAME}_BUILD_DIR_EXTERNAL_PKGS_DIR}") + set(tplConfigFile +- "${buildDirExternalPkgsDir}/${tplName}/${tplName}Config.cmake") ++ "${buildDirExternalPkgsDir}/TPL-Seacas-${tplName}/TPL-Seacas-${tplName}Config.cmake") + file(WRITE "${tplConfigFile}" "${configFileStr}") + + endfunction() +diff --git a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +index c49a2c019..7c906ce26 100644 +--- a/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake ++++ b/cmake/tribits/core/package_arch/TribitsExternalPackageWriteConfigFile.cmake +@@ -334,9 +334,10 @@ function(tribits_extpkg_add_find_upstream_dependencies_str + endif() + string(APPEND configFileFragStr + "if (NOT TARGET TPL::${upstreamTplDepName}::all_libs)\n" +- " set(${upstreamTplDepName}_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../${upstreamTplDepName}\")\n" ++ " set(TPL-Seacas-${upstreamTplDepName}_DIR \"\${CMAKE_CURRENT_LIST_DIR}/../TPL-Seacas-${upstreamTplDepName}\")\n" # Looks for internal dep ++ " # Really only upstream ? NO ! THis is for ::all_libs targets in internal consumers\n" + " find_dependency(TPL-Seacas-${upstreamTplDepName} REQUIRED CONFIG \${${tplName}_SearchNoOtherPathsArgs})\n" +- " unset(${upstreamTplDepName}_DIR)\n" ++ " unset(TPL-Seacas-${upstreamTplDepName}_DIR)\n" + "endif()\n" + "\n" + ) diff --git a/ports/seacas/portfile.cmake b/ports/seacas/portfile.cmake new file mode 100644 index 00000000000000..33b184b452fe17 --- /dev/null +++ b/ports/seacas/portfile.cmake @@ -0,0 +1,118 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sandialabs/seacas + REF 47120843900fd7ef845688fa145ebf76a825bc51 + SHA512 13677746457edbd4b3619576a6c474f5d8ab2eb24f648fac687e655e3121282b62994575723d18db8d18b42266d219aa4d83344ecff53f5e9a737513a3461180 + HEAD_REF master + PATCHES fix_tpl_libs.patch + fix-ioss-includes.patch + deps-and-shared.patch + fix-mpi.patch +) + +if(NOT VCPKG_TARGET_IS_OSX) + set(MPI_FEATURES mpi TPL_ENABLE_ParMETIS) +endif() + +vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS + FEATURES + mpi TPL_ENABLE_MPI + # mpi TPL_ENABLE_Pnetcdf # missing Pnetcdf port + ${MPI_FEATURES} +) + +if(VCPKG_TARGET_IS_WINDOWS) + list(APPEND FEATURE_OPTIONS "-DTPL_ENABLE_DLlib:BOOL=OFF") +endif() + +set(tpl_disable_list GTest DataWarp Pamgen X11 CUDA Kokkos Faodel Pnetcdf ADIOS2 Catalyst2) + +set(tpl_enable_list Zlib HDF5 Netcdf CGNS Matio fmt Cereal) + +if(VCPKG_TARGET_IS_OSX) + list(APPEND tpl_disable_list METIS) +else() + list(APPEND tpl_enable_list METIS) +endif() + +set(tpl_options "") +foreach(tpl IN LISTS tpl_disable_list) + list(APPEND tpl_options "-DTPL_ENABLE_${tpl}:BOOL=OFF") +endforeach() +foreach(tpl IN LISTS tpl_enable_list) + list(APPEND tpl_options "-DTPL_ENABLE_${tpl}:BOOL=ON") +endforeach() + +set(disabled_projects Chaco Aprepro_lib SuplibC SuplibCpp Nemslice Nemspread Nas2exo Cpup Epu Ejoin Conjoin Aprepro Exo_format) +set(proj_options "") +foreach(proj IN LISTS disabled_projects) + list(APPEND proj_options "-DSeacas_ENABLE_SEACAS${proj}:BOOL=OFF") +endforeach() +set(enabled_projects Ioss Nemesis Exodus) +set(proj_options "") +foreach(proj IN LISTS disabled_projects) + list(APPEND proj_options "-DSeacas_ENABLE_SEACAS${proj}:BOOL=OFF") +endforeach() + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + #--trace-expand + ${FEATURE_OPTIONS} + -DBUILD_TESTING=OFF + -DSeacas_ENABLE_Zoltan:BOOL=OFF + -DSeacas_ENABLE_SEACAS:BOOL=ON + "-DSeacas_HOSTNAME:STRING=localhost" + "-DSeacas_GENERATE_REPO_VERSION_FILE:BOOL=OFF" + "-DNetcdf_ALLOW_MODERN:BOOL=ON" + "-DSeacas_ENABLE_Fortran:BOOL=OFF" + #"-DCGNS_ALLOW_PREDEFIND:BOOL=NO" + #"-DSeacas_ENABLE_ALL_PACKAGES:BOOL=ON" + ${proj_options} + ${tpl_options} +) + +vcpkg_cmake_install() + +set(cmake_config_list ${enabled_projects}) +list(TRANSFORM cmake_config_list PREPEND "SEACAS") +list(APPEND cmake_config_list SEACAS) + +foreach(cmake_conig IN LISTS cmake_config_list) + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/${cmake_conig}" PACKAGE_NAME cmake/${cmake_conig} DO_NOT_DELETE_PARENT_CONFIG_PATH NO_PREFIX_CORRECTION) +endforeach() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/external_packages" PACKAGE_NAME external_packages DO_NOT_DELETE_PARENT_CONFIG_PATH NO_PREFIX_CORRECTION ) +if(EXISTS "${CURRENT_PACKAGES_DIR}/lib/cmake/Seacas") + # Case sensitive filesystems will have two Seacas folders + vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/Seacas" PACKAGE_NAME cmake/Seacas DO_NOT_DELETE_PARENT_CONFIG_PATH NO_PREFIX_CORRECTION) +endif() + +set(tool_names cgns_decomp cth_pressure_map + io_info io_modify io_shell + shell_to_hex skinner sphgen struc_to_unstruc) + +vcpkg_copy_tools(TOOL_NAMES ${tool_names} AUTO_CLEAN) + +if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") + file(GLOB remaining_bin_stuff "${CURRENT_PACKAGES_DIR}/bin/*" LIST_DIRECTORIES true) + if(NOT remaining_bin_stuff) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/bin" "${CURRENT_PACKAGES_DIR}/debug/bin") + else() + message(WARNING "remaining_bin_stuff:${remaining_bin_stuff}") + endif() +endif() + +# vcpkg really needs: vcpkg_remove_dirs_if_empty() +file(GLOB remaining_cmake_dirs "${CURRENT_PACKAGES_DIR}/lib/cmake/*" LIST_DIRECTORIES true) +if(NOT remaining_cmake_dirs) + file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/lib/cmake" "${CURRENT_PACKAGES_DIR}/debug/lib/cmake") +else() + message(WARNING "remaining_cmake_dirs:${remaining_cmake_dirs}") +endif() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") +file(REMOVE "${CURRENT_PACKAGES_DIR}/include/SeacasConfig.cmake") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + diff --git a/ports/seacas/vcpkg.json b/ports/seacas/vcpkg.json new file mode 100644 index 00000000000000..3cf649e57ed635 --- /dev/null +++ b/ports/seacas/vcpkg.json @@ -0,0 +1,66 @@ +{ + "name": "seacas", + "version-date": "2022-11-22", + "description": "The Sandia Engineering Analysis Code Access System (SEACAS) is a suite of preprocessing, postprocessing, translation, and utility applications supporting finite element analysis software using the Exodus database file format.", + "homepage": "https://github.com/sandialabs/seacas", + "license": null, + "dependencies": [ + "cereal", + "cgns", + "fmt", + { + "name": "hdf5", + "default-features": false + }, + { + "name": "matio", + "default-features": false, + "features": [ + "hdf5" + ] + }, + "metis", + { + "name": "netcdf-c", + "default-features": false, + "features": [ + "hdf5" + ] + }, + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + }, + "zlib" + ], + "features": { + "mpi": { + "description": "Enable MPI support", + "dependencies": [ + { + "name": "cgns", + "default-features": false, + "features": [ + "mpi" + ] + }, + { + "name": "hdf5", + "default-features": false, + "features": [ + "parallel" + ] + }, + { + "name": "parmetis", + "default-features": false, + "platform": "!osx" + } + ] + } + } +} diff --git a/ports/verdict/fix_osx.patch b/ports/verdict/fix_osx.patch new file mode 100644 index 00000000000000..114387e0848c01 --- /dev/null +++ b/ports/verdict/fix_osx.patch @@ -0,0 +1,125 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c41d98f70..83f7ca27a 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -53,7 +53,7 @@ configure_file( + add_library(verdict ${verdict_SOURCES}) + target_include_directories(verdict PUBLIC + $ $ $) +- ++target_compile_features(verdict PUBLIC cxx_std_11) + + # Setting the VERSION and SOVERSION of a library will include + # version information either in the library, or in the library +diff --git a/V_HexMetric.cpp b/V_HexMetric.cpp +index 6ba32fa86..5fd976321 100644 +--- a/V_HexMetric.cpp ++++ b/V_HexMetric.cpp +@@ -2974,10 +2974,10 @@ double hex_distortion(int num_nodes, const double coordinates[][3]) + double weight[maxTotalNumberGaussPoints]; + + // create an object of GaussIntegration +- GaussIntegration gint{}; +- gint.initialize(number_of_gauss_points, num_nodes, number_dimension); +- gint.calculate_shape_function_3d_hex(); +- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight); ++ GaussIntegration gaussint; ++ gaussint.initialize(number_of_gauss_points, num_nodes, number_dimension); ++ gaussint.calculate_shape_function_3d_hex(); ++ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight); + + VerdictVector xxi, xet, xze, xin; + +@@ -3014,7 +3014,7 @@ double hex_distortion(int num_nodes, const double coordinates[][3]) + double dndy2_at_node[maxNumberNodes][maxNumberNodes]; + double dndy3_at_node[maxNumberNodes][maxNumberNodes]; + +- gint.calculate_derivative_at_nodes_3d(dndy1_at_node, dndy2_at_node, dndy3_at_node); ++ gaussint.calculate_derivative_at_nodes_3d(dndy1_at_node, dndy2_at_node, dndy3_at_node); + int node_id; + for (node_id = 0; node_id < num_nodes; node_id++) + { +diff --git a/V_QuadMetric.cpp b/V_QuadMetric.cpp +index 0c7c508e0..8e8a2537e 100644 +--- a/V_QuadMetric.cpp ++++ b/V_QuadMetric.cpp +@@ -1329,10 +1329,10 @@ double quad_distortion(int num_nodes, const double coordinates[][3]) + double weight[maxTotalNumberGaussPoints]; + + // create an object of GaussIntegration +- GaussIntegration gint{}; +- gint.initialize(number_of_gauss_points, num_nodes); +- gint.calculate_shape_function_2d_quad(); +- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight); ++ GaussIntegration gaussint; ++ gaussint.initialize(number_of_gauss_points, num_nodes); ++ gaussint.calculate_shape_function_2d_quad(); ++ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight); + + // calculate element area + int ife, ja; +@@ -1355,7 +1355,7 @@ double quad_distortion(int num_nodes, const double coordinates[][3]) + double dndy1_at_node[maxNumberNodes][maxNumberNodes]; + double dndy2_at_node[maxNumberNodes][maxNumberNodes]; + +- gint.calculate_derivative_at_nodes(dndy1_at_node, dndy2_at_node); ++ gaussint.calculate_derivative_at_nodes(dndy1_at_node, dndy2_at_node); + + VerdictVector normal_at_nodes[9]; + +diff --git a/V_TetMetric.cpp b/V_TetMetric.cpp +index feb026968..dc956edb0 100644 +--- a/V_TetMetric.cpp ++++ b/V_TetMetric.cpp +@@ -1354,10 +1354,10 @@ double tet_distortion(int num_nodes, const double coordinates[][3]) + double weight[maxTotalNumberGaussPoints]; + + // create an object of GaussIntegration for tet +- GaussIntegration gint{}; +- gint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri); +- gint.calculate_shape_function_3d_tet(); +- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight); ++ GaussIntegration gaussint; ++ gaussint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri); ++ gaussint.calculate_shape_function_3d_tet(); ++ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], dndy3[0], weight); + + // vector xxi is the derivative vector of coordinates w.r.t local xi coordinate in the + // computation space +@@ -1402,7 +1402,7 @@ double tet_distortion(int num_nodes, const double coordinates[][3]) + double dndy2_at_node[maxNumberNodes][maxNumberNodes]; + double dndy3_at_node[maxNumberNodes][maxNumberNodes]; + +- gint.calculate_derivative_at_nodes_3d_tet(dndy1_at_node, dndy2_at_node, dndy3_at_node); ++ gaussint.calculate_derivative_at_nodes_3d_tet(dndy1_at_node, dndy2_at_node, dndy3_at_node); + int node_id; + for (node_id = 0; node_id < num_nodes; node_id++) + { +diff --git a/V_TriMetric.cpp b/V_TriMetric.cpp +index 2fb5c37e8..71c16bea7 100644 +--- a/V_TriMetric.cpp ++++ b/V_TriMetric.cpp +@@ -664,10 +664,10 @@ double tri_distortion(int num_nodes, const double coordinates[][3]) + // create an object of GaussIntegration + int number_dims = 2; + int is_tri = 1; +- GaussIntegration gint{}; +- gint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri); +- gint.calculate_shape_function_2d_tri(); +- gint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight); ++ GaussIntegration gaussint; ++ gaussint.initialize(number_of_gauss_points, num_nodes, number_dims, is_tri); ++ gaussint.calculate_shape_function_2d_tri(); ++ gaussint.get_shape_func(shape_function[0], dndy1[0], dndy2[0], weight); + + // calculate element area + int ife, ja; +@@ -691,7 +691,7 @@ double tri_distortion(int num_nodes, const double coordinates[][3]) + double dndy1_at_node[maxNumberNodes][maxNumberNodes]; + double dndy2_at_node[maxNumberNodes][maxNumberNodes]; + +- gint.calculate_derivative_at_nodes_2d_tri(dndy1_at_node, dndy2_at_node); ++ gaussint.calculate_derivative_at_nodes_2d_tri(dndy1_at_node, dndy2_at_node); + + VerdictVector normal_at_nodes[7]; + diff --git a/ports/verdict/include.patch b/ports/verdict/include.patch new file mode 100644 index 00000000000000..3b25e4f887672f --- /dev/null +++ b/ports/verdict/include.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 7db55ee4f..c41d98f70 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,7 +52,7 @@ configure_file( + + add_library(verdict ${verdict_SOURCES}) + target_include_directories(verdict PUBLIC +- $ $) ++ $ $ $) + + + # Setting the VERSION and SOVERSION of a library will include diff --git a/ports/verdict/portfile.cmake b/ports/verdict/portfile.cmake new file mode 100644 index 00000000000000..dfc91d15b12187 --- /dev/null +++ b/ports/verdict/portfile.cmake @@ -0,0 +1,24 @@ +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO sandialabs/verdict + REF fb582cf4fc04ecbd2bf423554325bda01231227a + SHA512 137a386a6c11bf2738d752f995a8cf66661efedab72980a787893f8594066197dd8a966ed906d0d8b95cb05a2ec1b8e95906bb9214cf05604058719798ce7dbd + HEAD_REF master + PATCHES include.patch + fix_osx.patch +) + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DVERDICT_ENABLE_TESTING=OFF +) + +vcpkg_cmake_install() +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/verdict" PACKAGE_NAME verdict) + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") + +file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME "copyright") + diff --git a/ports/verdict/vcpkg.json b/ports/verdict/vcpkg.json new file mode 100644 index 00000000000000..220817dab0b475 --- /dev/null +++ b/ports/verdict/vcpkg.json @@ -0,0 +1,17 @@ +{ + "name": "verdict", + "version": "1.4.0", + "description": "Compute quality functions of 2 and 3-dimensional regions.", + "homepage": "https://github.com/sandialabs/verdict", + "license": null, + "dependencies": [ + { + "name": "vcpkg-cmake", + "host": true + }, + { + "name": "vcpkg-cmake-config", + "host": true + } + ] +} diff --git a/ports/vtk-dicom/portfile.cmake b/ports/vtk-dicom/portfile.cmake index cf856bbbfe6308..9647dfd97a05a7 100644 --- a/ports/vtk-dicom/portfile.cmake +++ b/ports/vtk-dicom/portfile.cmake @@ -12,20 +12,24 @@ else() set(USE_GDCM OFF ) endif() - if(USE_GDCM) list(APPEND ADDITIONAL_OPTIONS -DUSE_GDCM=ON -DUSE_DCMTK=OFF ) endif() -vcpkg_find_acquire_program(PYTHON3) + +set(python_ver "") +if(NOT VCPKG_TARGET_IS_WINDOWS) + set(python_ver 3.10) +endif() + vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS -DBUILD_PROGRAMS=OFF -DBUILD_EXAMPLES=OFF - "-DPython3_EXECUTABLE=${PYTHON3}" + "-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}" ${ADDITIONAL_OPTIONS} ) @@ -36,5 +40,5 @@ vcpkg_copy_pdbs() file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") -# Handle copyright vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/Copyright.txt") + diff --git a/ports/vtk-dicom/vcpkg.json b/ports/vtk-dicom/vcpkg.json index 66994e60fe811e..3494381588dfbe 100644 --- a/ports/vtk-dicom/vcpkg.json +++ b/ports/vtk-dicom/vcpkg.json @@ -1,10 +1,16 @@ { "name": "vtk-dicom", "version": "0.8.14", + "port-version": 1, "description": "DICOM for VTK", "homepage": "https://github.com/dgobbi/vtk-dicom", "license": "BSD-3-Clause", "dependencies": [ + { + "name": "python3", + "host": true, + "default-features": false + }, { "name": "vcpkg-cmake", "host": true diff --git a/ports/vtk-m/portfile.cmake b/ports/vtk-m/portfile.cmake index 373aba8ba090dc..4cacf051542cb6 100644 --- a/ports/vtk-m/portfile.cmake +++ b/ports/vtk-m/portfile.cmake @@ -40,17 +40,19 @@ 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 13a117e0e8935eef3f320b5a1cd71d9911ad9853 # v1.6.0 Version is strongly locked to VTK 9.0. Upgrading will most likly brake the VTK build - SHA512 54f7f52ab4ee7954b6a303ffd3b8bcb18105b5d2fd8ed54b4e487fce2ebfbc51507e632189f775c79eea22ad24bd56bca401ddd679fc03d787342dd33d2ba18b + REF 902fdac6fafb6358ce88f8747d55e2c0715241f1 # v1.9.0 Upgrading will most likly brake the VTK build + SHA512 f83872495ed3dbcea372776c4439a7d224568d144ff602c188fae120026778b1bee681c9e9535cc693e870cbc08ca9896af2bc954935c289f6b9a24f2471a50b FILE_DISAMBIGUATOR 1) vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" OPTIONS ${OPTIONS} ) vcpkg_cmake_install() -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vtkm-1.6 PACKAGE_NAME vtkm) +vcpkg_cmake_config_fixup(CONFIG_PATH "lib/cmake/vtkm-1.9" PACKAGE_NAME vtkm) -vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" [[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")]]) +vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" + [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/lib/cmake/vtkm-1.9")]] + [[set_and_check(VTKm_CONFIG_DIR "${PACKAGE_PREFIX_DIR}/share/vtkm")]]) vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/share/vtkm/VTKmConfig.cmake" "${CURRENT_BUILDTREES_DIR}" "not/existing/buildtree") file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share") diff --git a/ports/vtk-m/vcpkg.json b/ports/vtk-m/vcpkg.json index 08ad663c173e37..c615f36f90c7cb 100644 --- a/ports/vtk-m/vcpkg.json +++ b/ports/vtk-m/vcpkg.json @@ -1,10 +1,10 @@ { "name": "vtk-m", - "version-semver": "1.6.0", - "port-version": 2, + "version": "1.9.0", "description": "VTK-m is a toolkit of scientific visualization algorithms for emerging processor architectures.", "homepage": "https://gitlab.kitware.com/vtk/vtk-m/", - "supports": "!x86 & !uwp", + "license": null, + "supports": "!x86 & !uwp & !(arm & windows)", "dependencies": [ { "name": "vcpkg-cmake", diff --git a/ports/vtk/156fb524.patch b/ports/vtk/156fb524.patch deleted file mode 100644 index 716fd5c7e3e2f6..00000000000000 --- a/ports/vtk/156fb524.patch +++ /dev/null @@ -1,393 +0,0 @@ -diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt -index 14e84f1dd6e8b9da275045fe5d80868b2e52ad5a..3a41bc4d2bffca8c3df79da218443b90f8ceb7d3 100644 ---- a/Accelerators/Vtkm/Filters/CMakeLists.txt -+++ b/Accelerators/Vtkm/Filters/CMakeLists.txt -@@ -46,6 +46,10 @@ foreach (class IN LISTS impl_classes) - list(APPEND headers "${class}.h") - endforeach () - -+list(APPEND sources -+ "vtkmClipInstantiationsWithField.cxx" -+ "vtkmClipInstantiationsWithImplicitFunction.cxx") -+ - configure_file( - "${CMAKE_CURRENT_SOURCE_DIR}/vtkmConfigFilters.h.in" - "${CMAKE_CURRENT_BINARY_DIR}/vtkmConfigFilters.h" -diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx -index 0b1dc86d3bedd425d4846f524818a68ada052ce9..65fec3110ebb6522900cbc965c5298031921e1e4 100644 ---- a/Accelerators/Vtkm/Filters/vtkmClip.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx -@@ -14,6 +14,7 @@ - =========================================================================*/ - - #include "vtkmClip.h" -+#include "vtkmClipInternals.h" - - #include "vtkCellIterator.h" - #include "vtkDataArray.h" -@@ -36,11 +37,9 @@ - - #include "vtkmFilterPolicy.h" - -+#include - #include - --#include --#include -- - #include - - vtkStandardNewMacro(vtkmClip); -@@ -50,19 +49,17 @@ void vtkmClip::PrintSelf(std::ostream& os, vtkIndent indent) - { - this->Superclass::PrintSelf(os, indent); - -- os << indent << "ClipValue: " << this->ClipValue << "\n"; -+ os << indent << "ClipValue: " << this->GetClipValue() << "\n"; - os << indent << "ClipFunction: \n"; -- this->ClipFunction->PrintSelf(os, indent.GetNextIndent()); -- os << indent << "ComputeScalars: " << this->ComputeScalars << "\n"; -+ this->GetClipFunction()->PrintSelf(os, indent.GetNextIndent()); -+ os << indent << "ComputeScalars: " << this->GetComputeScalars() << "\n"; - } - - //------------------------------------------------------------------------------ - vtkmClip::vtkmClip() -- : ClipValue(0.) -- , ComputeScalars(true) -- , ClipFunction(nullptr) -- , ClipFunctionConverter(new tovtkm::ImplicitFunctionConverter) -+ : Internals(new vtkmClip::internals) - { -+ this->Internals->ClipFunctionConverter.reset(new tovtkm::ImplicitFunctionConverter()); - // Clip active point scalars by default - this->SetInputArrayToProcess( - 0, 0, 0, vtkDataObject::FIELD_ASSOCIATION_POINTS, vtkDataSetAttributes::SCALARS); -@@ -75,24 +72,54 @@ vtkmClip::~vtkmClip() = default; - vtkMTimeType vtkmClip::GetMTime() - { - vtkMTimeType mTime = this->Superclass::GetMTime(); -- if (this->ClipFunction) -+ if (this->GetClipFunction()) - { -- mTime = std::max(mTime, this->ClipFunction->GetMTime()); -+ mTime = std::max(mTime, this->GetClipFunction()->GetMTime()); - } - return mTime; - } - -+//------------------------------------------------------------------------------ -+double vtkmClip::GetClipValue() -+{ -+ return this->Internals->ClipValue; -+} -+ -+//------------------------------------------------------------------------------ -+void vtkmClip::SetClipValue(double val) -+{ -+ this->Internals->ClipValue = val; -+} -+ -+//------------------------------------------------------------------------------ -+bool vtkmClip::GetComputeScalars() -+{ -+ return this->Internals->ComputeScalars; -+} -+ -+//------------------------------------------------------------------------------ -+void vtkmClip::SetComputeScalars(bool val) -+{ -+ this->Internals->ComputeScalars = val; -+} -+ - //------------------------------------------------------------------------------ - void vtkmClip::SetClipFunction(vtkImplicitFunction* clipFunction) - { -- if (this->ClipFunction != clipFunction) -+ if (this->GetClipFunction() != clipFunction) - { -- this->ClipFunction = clipFunction; -- this->ClipFunctionConverter->Set(clipFunction); -+ this->Internals->ClipFunction = clipFunction; -+ this->Internals->ClipFunctionConverter->Set(clipFunction); - this->Modified(); - } - } - -+//------------------------------------------------------------------------------ -+vtkImplicitFunction* vtkmClip::GetClipFunction() -+{ -+ return this->Internals->ClipFunction; -+} -+ - //------------------------------------------------------------------------------ - int vtkmClip::RequestData( - vtkInformation*, vtkInformationVector** inInfoVec, vtkInformationVector* outInfoVec) -@@ -111,7 +138,7 @@ int vtkmClip::RequestData( - // Find the scalar array: - int assoc = this->GetInputArrayAssociation(0, inInfoVec); - vtkDataArray* scalars = this->GetInputArrayToProcess(0, inInfoVec); -- if (!this->ClipFunction && -+ if (!this->GetClipFunction() && - (assoc != vtkDataObject::FIELD_ASSOCIATION_POINTS || scalars == nullptr || - scalars->GetName() == nullptr || scalars->GetName()[0] == '\0')) - { -@@ -129,37 +156,18 @@ int vtkmClip::RequestData( - { - // Convert inputs to vtkm objects: - auto fieldsFlag = -- this->ComputeScalars ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; -+ this->GetComputeScalars() ? tovtkm::FieldsFlag::PointsAndCells : tovtkm::FieldsFlag::None; - auto in = tovtkm::Convert(input, fieldsFlag); - - // Run filter: - vtkm::cont::DataSet result; -- if (this->ClipFunction) -+ if (this->GetClipFunction()) - { -- vtkm::filter::ClipWithImplicitFunction functionFilter; -- auto function = this->ClipFunctionConverter->Get(); -- if (function.GetValid()) -- { -- functionFilter.SetImplicitFunction(function); -- result = functionFilter.Execute(in); -- } -+ result = this->Internals->ExecuteClipWithImplicitFunction(in); - } - else - { -- vtkm::filter::ClipWithField fieldFilter; -- if (!this->ComputeScalars) -- { -- // explicitly convert just the field we need -- auto inField = tovtkm::Convert(scalars, assoc); -- in.AddField(inField); -- // don't pass this field -- fieldFilter.SetFieldsToPass( -- vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); -- } -- -- fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS); -- fieldFilter.SetClipValue(this->ClipValue); -- result = fieldFilter.Execute(in); -+ result = this->Internals->ExecuteClipWithField(in, scalars, assoc); - } - - // Convert result to output: -@@ -169,7 +177,7 @@ int vtkmClip::RequestData( - return 0; - } - -- if (!this->ClipFunction && this->ComputeScalars) -+ if (!this->GetClipFunction() && this->GetComputeScalars()) - { - output->GetPointData()->SetActiveScalars(scalars->GetName()); - } -@@ -189,8 +197,8 @@ int vtkmClip::RequestData( - << "Falling back to serial implementation."); - - vtkNew filter; -- filter->SetClipFunction(this->ClipFunction); -- filter->SetValue(this->ClipValue); -+ filter->SetClipFunction(this->GetClipFunction()); -+ filter->SetValue(this->GetClipValue()); - filter->SetInputData(input); - filter->Update(); - output->ShallowCopy(filter->GetOutput()); -diff --git a/Accelerators/Vtkm/Filters/vtkmClip.h b/Accelerators/Vtkm/Filters/vtkmClip.h -index edb3cebfadc9ebeddf3c5030716ba532c0e149fe..6f33d36460d72de340eb81bb321ee868d70e6b5b 100644 ---- a/Accelerators/Vtkm/Filters/vtkmClip.h -+++ b/Accelerators/Vtkm/Filters/vtkmClip.h -@@ -32,13 +32,6 @@ - - class vtkImplicitFunction; - --namespace tovtkm --{ -- --class ImplicitFunctionConverter; -- --} // namespace tovtkm -- - class VTKACCELERATORSVTKMFILTERS_EXPORT vtkmClip : public vtkUnstructuredGridAlgorithm - { - public: -@@ -50,15 +43,15 @@ public: - * The scalar value to use when clipping the dataset. Values greater than - * ClipValue are preserved in the output dataset. Default is 0. - */ -- vtkGetMacro(ClipValue, double); -- vtkSetMacro(ClipValue, double); -+ double GetClipValue(); -+ void SetClipValue(double); - - /** - * If true, all input point data arrays will be mapped onto the output - * dataset. Default is true. - */ -- vtkGetMacro(ComputeScalars, bool); -- vtkSetMacro(ComputeScalars, bool); -+ bool GetComputeScalars(); -+ void SetComputeScalars(bool); - - /** - * Set the implicit function with which to perform the clipping. If set, -@@ -66,7 +59,7 @@ public: - * function. - */ - void SetClipFunction(vtkImplicitFunction*); -- vtkGetObjectMacro(ClipFunction, vtkImplicitFunction); -+ vtkImplicitFunction* GetClipFunction(); - - vtkMTimeType GetMTime() override; - -@@ -87,17 +80,13 @@ protected: - ~vtkmClip() override; - - int RequestData(vtkInformation*, vtkInformationVector**, vtkInformationVector*) override; -- - int FillInputPortInformation(int port, vtkInformation* info) override; - -- double ClipValue; -- bool ComputeScalars; -- -- vtkImplicitFunction* ClipFunction; -- std::unique_ptr ClipFunctionConverter; -- - vtkTypeBool ForceVTKm = false; - -+ struct internals; -+ std::unique_ptr Internals; -+ - private: - vtkmClip(const vtkmClip&) = delete; - void operator=(const vtkmClip&) = delete; -diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx -new file mode 100644 -index 0000000000000000000000000000000000000000..e81b5cdab62a436ef09afac33ffa0599cb9dd2a8 ---- /dev/null -+++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithField.cxx -@@ -0,0 +1,39 @@ -+/*========================================================================= -+ -+ Program: Visualization Toolkit -+ Module: vtkmClipInstantiationsWithField.cxx -+ -+ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen -+ All rights reserved. -+ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. -+ -+ This software is distributed WITHOUT ANY WARRANTY; without even -+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -+ PURPOSE. See the above copyright notice for more information. -+ -+=========================================================================*/ -+ -+#include "vtkmClipInternals.h" -+#include "vtkmlib/DataSetConverters.h" -+ -+#include -+ -+//------------------------------------------------------------------------------ -+vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithField( -+ vtkm::cont::DataSet& in, vtkDataArray* scalars, int assoc) -+{ -+ vtkm::filter::ClipWithField fieldFilter; -+ if (!this->ComputeScalars) -+ { -+ // explicitly convert just the field we need -+ auto inField = tovtkm::Convert(scalars, assoc); -+ in.AddField(inField); -+ // don't pass this field -+ fieldFilter.SetFieldsToPass( -+ vtkm::filter::FieldSelection(vtkm::filter::FieldSelection::MODE_NONE)); -+ } -+ -+ fieldFilter.SetActiveField(scalars->GetName(), vtkm::cont::Field::Association::POINTS); -+ fieldFilter.SetClipValue(this->ClipValue); -+ return fieldFilter.Execute(in); -+} -diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx -new file mode 100644 -index 0000000000000000000000000000000000000000..04a637a92d487b019742bbf81884750c48ba105d ---- /dev/null -+++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx -@@ -0,0 +1,35 @@ -+/*========================================================================= -+ -+ Program: Visualization Toolkit -+ Module: vtkmClipInstantiationsWithImplicitFunction.cxx -+ -+ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen -+ All rights reserved. -+ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. -+ -+ This software is distributed WITHOUT ANY WARRANTY; without even -+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -+ PURPOSE. See the above copyright notice for more information. -+ -+=========================================================================*/ -+ -+#include "vtkmClipInternals.h" -+#include "vtkmlib/DataSetConverters.h" -+ -+#include -+ -+//------------------------------------------------------------------------------ -+vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::cont::DataSet& in) -+{ -+ auto function = this->ClipFunctionConverter->Get(); -+ -+ vtkm::cont::DataSet result; -+ if (function.GetValid()) -+ { -+ vtkm::filter::ClipWithImplicitFunction functionFilter; -+ functionFilter.SetImplicitFunction(function); -+ result = functionFilter.Execute(in); -+ } -+ -+ return result; -+} -diff --git a/Accelerators/Vtkm/Filters/vtkmClipInternals.h b/Accelerators/Vtkm/Filters/vtkmClipInternals.h -new file mode 100644 -index 0000000000000000000000000000000000000000..5384347bf9d48f04f5d2847753c92b64fc82346e ---- /dev/null -+++ b/Accelerators/Vtkm/Filters/vtkmClipInternals.h -@@ -0,0 +1,37 @@ -+/*========================================================================= -+ -+ Program: Visualization Toolkit -+ Module: vtkmClipInternals.h -+ -+ Copyright (c) Ken Martin, Will Schroeder, Bill Lorensen -+ All rights reserved. -+ See Copyright.txt or http://www.kitware.com/Copyright.htm for details. -+ -+ This software is distributed WITHOUT ANY WARRANTY; without even -+ the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -+ PURPOSE. See the above copyright notice for more information. -+ -+=========================================================================*/ -+ -+#ifndef vtkmClipInternals_h -+#define vtkmClipInternals_h -+ -+#include "vtkDataArray.h" -+#include "vtkmClip.h" -+#include "vtkmlib/ImplicitFunctionConverter.h" -+ -+#include -+ -+struct vtkmClip::internals -+{ -+ double ClipValue = .0; -+ bool ComputeScalars = true; -+ -+ vtkImplicitFunction* ClipFunction = nullptr; -+ std::unique_ptr ClipFunctionConverter; -+ -+ vtkm::cont::DataSet ExecuteClipWithImplicitFunction(vtkm::cont::DataSet&); -+ vtkm::cont::DataSet ExecuteClipWithField(vtkm::cont::DataSet&, vtkDataArray*, int); -+}; -+ -+#endif diff --git a/ports/vtk/1f00a0c9.patch b/ports/vtk/1f00a0c9.patch deleted file mode 100644 index 4cd8f196354c26..00000000000000 --- a/ports/vtk/1f00a0c9.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx -index da8f2e6498c2a08165500fc458eb3c9c7dc0b7e6..147c3c6e175dbd342095805750bfc4fee81735dc 100644 ---- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx -+++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx -@@ -265,7 +265,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) - std::lock_guard lock(locator.lock); - if (locator.buildTime < this->GetMTime()) - { -- locator.control.reset(new vtkm::cont::PointLocatorUniformGrid); -+ locator.control.reset(new vtkm::cont::PointLocatorSparseGrid); - locator.control->SetCoordinates(this->Internals->Coordinates); - locator.control->Update(); - locator.buildTime = this->GetMTime(); -diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx -index f311f90e17814a05d082a0df67108f242018bb69..7ecfa50e4aa9922987fd33f7b29eb1bf4be3577a 100644 ---- a/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx -+++ b/Accelerators/Vtkm/DataModel/vtkmlib/DataSetConverters.cxx -@@ -240,11 +240,11 @@ bool Convert(const vtkm::cont::DataSet& vtkmOut, vtkRectilinearGrid* output, vtk - auto coordsArray = vtkm::cont::Cast(vtkmOut.GetCoordinateSystem().GetData()); - - vtkSmartPointer xArray = -- Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetStorage().GetFirstArray())); -+ Convert(vtkm::cont::make_FieldPoint("xArray", coordsArray.GetFirstArray())); - vtkSmartPointer yArray = -- Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetStorage().GetSecondArray())); -+ Convert(vtkm::cont::make_FieldPoint("yArray", coordsArray.GetSecondArray())); - vtkSmartPointer zArray = -- Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetStorage().GetThirdArray())); -+ Convert(vtkm::cont::make_FieldPoint("zArray", coordsArray.GetThirdArray())); - - if (!xArray || !yArray || !zArray) - { -diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx -index 334ec1219dd269e323ae11e61a5a68e9e6e3d2e7..ed9d58fe91713a12e7b2588471275e694f71f618 100644 ---- a/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmAverageToCells.cxx -@@ -27,7 +27,6 @@ - #include "vtkmFilterPolicy.h" - - #include --#include - - vtkStandardNewMacro(vtkmAverageToCells); - -diff --git a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx -index 1003f88c4d4e1dcf0be24b7f9f4e6d58e4e735f0..00c722f3162ebb042fb3973bb28a3c1c2fb48c45 100644 ---- a/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmAverageToPoints.cxx -@@ -28,7 +28,6 @@ - #include "vtkmFilterPolicy.h" - - #include --#include - - vtkStandardNewMacro(vtkmAverageToPoints); - -diff --git a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx -index 98f0fdb70a296a8dd97df56f706f11e0aca20f32..0cfde7e99f8f07289b08310675ee16f438bc61be 100644 ---- a/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmCleanGrid.cxx -@@ -30,7 +30,6 @@ - #include "vtkmFilterPolicy.h" - - #include --#include - - vtkStandardNewMacro(vtkmCleanGrid); - -diff --git a/Accelerators/Vtkm/Filters/vtkmClip.cxx b/Accelerators/Vtkm/Filters/vtkmClip.cxx -index 2649b2da024310f58159574758d278318e23f4b9..0b1dc86d3bedd425d4846f524818a68ada052ce9 100644 ---- a/Accelerators/Vtkm/Filters/vtkmClip.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmClip.cxx -@@ -39,9 +39,7 @@ - #include - - #include --#include - #include --#include - - #include - -diff --git a/Accelerators/Vtkm/Filters/vtkmContour.cxx b/Accelerators/Vtkm/Filters/vtkmContour.cxx -index c9d35a544641a629ee4fb4f54c4d8245be8e6fd5..eae3a03398ffeef8b0f8ec449f89163f8c275122 100644 ---- a/Accelerators/Vtkm/Filters/vtkmContour.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmContour.cxx -@@ -33,7 +33,6 @@ - - #include - #include --#include - - vtkStandardNewMacro(vtkmContour); - -diff --git a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx -index 58969b5707aab56e6fcd6300ca650c9b2d88e32f..3661060164d738eb9055316fd6c0b023b09ef72f 100644 ---- a/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmExternalFaces.cxx -@@ -33,7 +33,6 @@ - #include "vtkmFilterPolicy.h" - - #include --#include - - vtkStandardNewMacro(vtkmExternalFaces); - -diff --git a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx -index 3606f28de2229436afbcb8b0cf3ed61430055b8e..32bf94f630931a0d052cf5880d950df4588046cb 100644 ---- a/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmExtractVOI.cxx -@@ -27,7 +27,6 @@ - #include "vtkmFilterPolicy.h" - - #include "vtkm/filter/ExtractStructured.h" --#include "vtkm/filter/ExtractStructured.hxx" - - vtkStandardNewMacro(vtkmExtractVOI); - -diff --git a/Accelerators/Vtkm/Filters/vtkmGradient.cxx b/Accelerators/Vtkm/Filters/vtkmGradient.cxx -index 9b79c9e5a5e434ae810df73b51bc6bf52cefa829..6aa284878c88e2fcaf243f6721477536891f002f 100644 ---- a/Accelerators/Vtkm/Filters/vtkmGradient.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmGradient.cxx -@@ -31,7 +31,6 @@ - - #include - #include --#include - - vtkStandardNewMacro(vtkmGradient); - -diff --git a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx -index ed09a73d938997fe0dab1ae7eb4338f4914bad15..c13fd742477686e2dd51e95c4757628630788a77 100644 ---- a/Accelerators/Vtkm/Filters/vtkmHistogram.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmHistogram.cxx -@@ -32,7 +32,6 @@ - #include "vtkSmartPointer.h" - - #include "vtkmFilterPolicy.h" --#include - #include - - vtkStandardNewMacro(vtkmHistogram); -diff --git a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx -index 04ccdce35f14b708c111302c759b5d328225cdef..db8d3f64b5e9b96f9b3e491f044056b14ae1bcdd 100644 ---- a/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmLevelOfDetail.cxx -@@ -33,7 +33,6 @@ - #include - // To handle computing custom coordinate sets bounds we need to include - // the following --#include - - vtkStandardNewMacro(vtkmLevelOfDetail); - -diff --git a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx -index 9906573f18312cb803e5ab2bce30218e4f95772c..685fb618764fc62969b5373cd922aaea7d1311e3 100644 ---- a/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmPointTransform.cxx -@@ -33,7 +33,6 @@ - - #include "vtkm/cont/Error.h" - #include "vtkm/filter/PointTransform.h" --#include "vtkm/filter/PointTransform.hxx" - - #include "vtkmFilterPolicy.h" - -diff --git a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx -index 7604acd333978a72b1e34584d14640e097b34292..647514050c42771cda57b439280d238de72911e2 100644 ---- a/Accelerators/Vtkm/Filters/vtkmThreshold.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmThreshold.cxx -@@ -31,7 +31,6 @@ - #include "vtkmFilterPolicy.h" - - #include --#include - - vtkStandardNewMacro(vtkmThreshold); - -diff --git a/ThirdParty/vtkm/vtkvtkm/vtk-m b/ThirdParty/vtkm/vtkvtkm/vtk-m -index 0457427ed7b4d21e1a8e33e96713414ca11a42fc..ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 160000 ---- a/ThirdParty/vtkm/vtkvtkm/vtk-m -+++ b/ThirdParty/vtkm/vtkvtkm/vtk-m -@@ -1 +1 @@ --Subproject commit 0457427ed7b4d21e1a8e33e96713414ca11a42fc -+Subproject commit ff7de5a72e917eac39f9a3c3a0002da5fa26c3f7 diff --git a/ports/vtk/FindHDF5.cmake b/ports/vtk/FindHDF5.cmake index 27d8a8c74c8247..9d929700706900 100644 --- a/ports/vtk/FindHDF5.cmake +++ b/ports/vtk/FindHDF5.cmake @@ -1,30 +1,22 @@ -find_package(hdf5 QUIET NO_MODULE) -if(TARGET hdf5::hdf5-shared) - set_target_properties(hdf5::hdf5-shared PROPERTIES IMPORTED_GLOBAL TRUE) - if(NOT TARGET hdf5::hdf5) - add_library(hdf5::hdf5 ALIAS hdf5::hdf5-shared) - endif() -elseif(TARGET hdf5::hdf5-static) - set_target_properties(hdf5::hdf5-static PROPERTIES IMPORTED_GLOBAL TRUE) - if(NOT TARGET hdf5::hdf5) - add_library(hdf5::hdf5 ALIAS hdf5::hdf5-static) - endif() -else() - message(FATAL_ERROR "HDF5 target not found") +find_package(hdf5 CONFIG REQUIRED) +if(NOT TARGET hdf5::hdf5 AND (TARGET hdf5::hdf5-static OR TARGET hdf5::hdf5-shared)) + add_library(hdf5::hdf5 INTERFACE IMPORTED) + if(TARGET hdf5::hdf5-shared) + target_link_libraries(hdf5::hdf5 INTERFACE hdf5::hdf5-shared) + elseif(TARGET hdf5::hdf5-static) + target_link_libraries(hdf5::hdf5 INTERFACE hdf5::hdf5-static) + endif() endif() -if(TARGET hdf5::hdf5_hl-shared) - set_target_properties(hdf5::hdf5_hl-shared PROPERTIES IMPORTED_GLOBAL TRUE) - if(NOT TARGET hdf5::hdf5_hl) - add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-shared) - endif() -elseif(TARGET hdf5::hdf5_hl-static) - set_target_properties(hdf5::hdf5_hl-static PROPERTIES IMPORTED_GLOBAL TRUE) - if(NOT TARGET hdf5::hdf5_hl) - add_library(hdf5::hdf5_hl ALIAS hdf5::hdf5_hl-static) - endif() -else() - message(FATAL_ERROR "HDF5 HL target not found") + +if(NOT TARGET hdf5::hdf5_hl AND (TARGET hdf5::hdf5_hl-static OR TARGET hdf5::hdf5_hl-shared)) + add_library(hdf5::hdf5_hl INTERFACE IMPORTED) + if(TARGET hdf5::hdf5_hl-shared) + target_link_libraries(hdf5::hdf5_hl INTERFACE hdf5::hdf5_hl-shared) + elseif(TARGET hdf5::hdf5_hl-static) + target_link_libraries(hdf5::hdf5_hl INTERFACE hdf5::hdf5_hl-static) + endif() endif() -set(HDF5_IS_PARALLEL ${HDF5_ENABLE_PARALLEL} CACHE BOOL "" FORCE) + +set(HDF5_IS_PARALLEL "${HDF5_ENABLE_PARALLEL}" CACHE BOOL "" FORCE) set(HDF5_FOUND ON CACHE BOOL "" FORCE) set(hdf5_FOUND ON CACHE BOOL "" FORCE) diff --git a/ports/vtk/UseProj5Api.patch b/ports/vtk/UseProj5Api.patch deleted file mode 100644 index 7ee7adae3a9673..00000000000000 --- a/ports/vtk/UseProj5Api.patch +++ /dev/null @@ -1,149 +0,0 @@ -From 0325638832e35c8c8c6fc96e2c1d887aeea3dd43 Mon Sep 17 00:00:00 2001 -From: Julien Schueller -Date: Mon, 8 Mar 2021 10:57:46 +0100 -Subject: [PATCH] Geovis: Use proj>=5 api - -Closes #18130 ---- - Geovis/Core/vtkGeoProjection.cxx | 17 ++++++++++++++++- - Geovis/Core/vtkGeoTransform.cxx | 28 ++++++++++++++-------------- - ThirdParty/libproj/vtk_libproj.h.in | 7 +------ - 3 files changed, 31 insertions(+), 21 deletions(-) - -diff --git a/Geovis/Core/vtkGeoProjection.cxx b/Geovis/Core/vtkGeoProjection.cxx -index 7ff6526a5d..0a0d06eba1 100644 ---- a/Geovis/Core/vtkGeoProjection.cxx -+++ b/Geovis/Core/vtkGeoProjection.cxx -@@ -121,7 +121,11 @@ vtkGeoProjection::~vtkGeoProjection() - this->SetPROJ4String(nullptr); - if (this->Projection) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ proj_destroy(this->Projection); -+#else - pj_free(this->Projection); -+#endif - } - delete this->Internals; - this->Internals = nullptr; -@@ -185,13 +189,21 @@ int vtkGeoProjection::UpdateProjection() - - if (this->Projection) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ proj_destroy(this->Projection); -+#else - pj_free(this->Projection); -+#endif - this->Projection = nullptr; - } - - if (this->PROJ4String && strlen(this->PROJ4String)) - { -+#if PROJ_VERSION_MAJOR >= 5 -+ this->Projection = proj_create(PJ_DEFAULT_CTX, this->PROJ4String); -+#else - this->Projection = pj_init_plus(this->PROJ4String); -+#endif - if (!this->Projection) - { - vtkErrorMacro("Cannot set projection with string " << this->PROJ4String); -@@ -234,8 +246,11 @@ int vtkGeoProjection::UpdateProjection() - stringHolder[i] = param.str(); - pjArgs[3 + i] = stringHolder[i].c_str(); - } -- -+#if PROJ_VERSION_MAJOR >= 5 -+ this->Projection = proj_create_argv(PJ_DEFAULT_CTX, argSize, const_cast(pjArgs)); -+#else - this->Projection = pj_init(argSize, const_cast(pjArgs)); -+#endif - delete[] pjArgs; - } - this->ProjectionMTime = this->GetMTime(); -diff --git a/Geovis/Core/vtkGeoTransform.cxx b/Geovis/Core/vtkGeoTransform.cxx -index 5c2c74279d..1c99b6b11b 100644 ---- a/Geovis/Core/vtkGeoTransform.cxx -+++ b/Geovis/Core/vtkGeoTransform.cxx -@@ -163,8 +163,12 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s - projPJ src = this->SourceProjection ? this->SourceProjection->GetProjection() : nullptr; - projPJ dst = this->DestinationProjection ? this->DestinationProjection->GetProjection() : nullptr; - int delta = stride - 2; -+#if PROJ_VERSION_MAJOR >= 5 -+ PJ_COORD c, c_out; -+#else - projLP lp; - projXY xy; -+#endif - if (src) - { - // Convert from src system to lat/long using inverse of src transform -@@ -172,17 +176,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s - for (vtkIdType i = 0; i < numPts; ++i) - { - #if PROJ_VERSION_MAJOR >= 5 -- xy.x = coord[0]; -- xy.y = coord[1]; -+ c.xy.x = coord[0]; -+ c.xy.y = coord[1]; -+ c_out = proj_trans(src, PJ_INV, c); -+ coord[0] = c_out.lp.lam; -+ coord[1] = c_out.lp.phi; - #else - xy.u = coord[0]; - xy.v = coord[1]; --#endif - lp = pj_inv(xy, src); --#if PROJ_VERSION_MAJOR >= 5 -- coord[0] = lp.lam; -- coord[1] = lp.phi; --#else - coord[0] = lp.u; - coord[1] = lp.v; - #endif -@@ -208,17 +210,15 @@ void vtkGeoTransform::InternalTransformPoints(double* x, vtkIdType numPts, int s - for (vtkIdType i = 0; i < numPts; ++i) - { - #if PROJ_VERSION_MAJOR >= 5 -- lp.lam = coord[0]; -- lp.phi = coord[1]; -+ c.lp.lam = coord[0]; -+ c.lp.phi = coord[1]; -+ c_out = proj_trans(src, PJ_FWD, c); -+ coord[0] = c_out.xy.x; -+ coord[1] = c_out.xy.y; - #else - lp.u = coord[0]; - lp.v = coord[1]; --#endif - xy = pj_fwd(lp, dst); --#if PROJ_VERSION_MAJOR >= 5 -- coord[0] = xy.x; -- coord[1] = xy.y; --#else - coord[0] = xy.u; - coord[1] = xy.v; - #endif -diff --git a/ThirdParty/libproj/vtk_libproj.h.in b/ThirdParty/libproj/vtk_libproj.h.in -index 4d8ffc3c5d..c4182c4db2 100644 ---- a/ThirdParty/libproj/vtk_libproj.h.in -+++ b/ThirdParty/libproj/vtk_libproj.h.in -@@ -28,14 +28,9 @@ - #if VTK_MODULE_USE_EXTERNAL_vtklibproj - # if VTK_LibPROJ_MAJOR_VERSION >= 5 - # include --# endif --# if VTK_LibPROJ_MAJOR_VERSION < 6 -+# else - # include - # endif --# if VTK_LibPROJ_MAJOR_VERSION >= 6 --# define ACCEPT_USE_OF_DEPRECATED_PROJ_API_H 1 --# endif --# include - # include - #else - # include --- -2.32.0.windows.1 - diff --git a/ports/vtk/afxdll.patch b/ports/vtk/afxdll.patch new file mode 100644 index 00000000000000..b528bf47f95e03 --- /dev/null +++ b/ports/vtk/afxdll.patch @@ -0,0 +1,13 @@ +diff --git a/GUISupport/MFC/CMakeLists.txt b/GUISupport/MFC/CMakeLists.txt +index 66b52f1f6..7fbfef908 100644 +--- a/GUISupport/MFC/CMakeLists.txt ++++ b/GUISupport/MFC/CMakeLists.txt +@@ -10,7 +10,7 @@ endif () + # Determine whether the shared or static MFC implementation to use. + if (use_policy_0091) # XXX(cmake-3.15) + if (NOT CMAKE_MSVC_RUNTIME_LIBRARY OR # The default uses `DLL`. +- CMAKE_MSVC_RUNTIME_LIBRARY MATCHES "DLL$") ++ VCPKG_CRT_LINKAGE MATCHES "dynamic") + set(vtk_mfc_static 0) + else () + set(vtk_mfc_static 1) diff --git a/ports/vtk/cgns.patch b/ports/vtk/cgns.patch new file mode 100644 index 00000000000000..5b7258ab9a0994 --- /dev/null +++ b/ports/vtk/cgns.patch @@ -0,0 +1,106 @@ +diff --git a/CMake/FindCGNS.cmake b/CMake/FindCGNS.cmake +index 005f1afd9..35c6de184 100644 +--- a/CMake/FindCGNS.cmake ++++ b/CMake/FindCGNS.cmake +@@ -1,48 +1,53 @@ +-# +-# Find the native CGNS includes and library +-# +-# CGNS_INCLUDE_DIR - where to find cgns.h, etc. +-# CGNS_LIBRARIES - List of fully qualified libraries to link against when using CGNS. +-# CGNS_FOUND - Do not attempt to use CGNS if "no" or undefined. +- +-find_path(CGNS_INCLUDE_DIR +- NAMES +- cgnslib.h +- PATHS +- /usr/local/include +- /usr/include +- DOC "CGNS include directory") +-mark_as_advanced(CGNS_INCLUDE_DIR) +- +-find_library(CGNS_LIBRARY +- NAMES +- cgns +- DOC "CGNS library") +-mark_as_advanced(CGNS_LIBRARY) +- +-if (CGNS_INCLUDE_DIR) +- file(STRINGS "${CGNS_INCLUDE_DIR}/cgnslib.h" version +- REGEX "CGNS_DOTVERS") +- string(REGEX REPLACE ".*CGNS_DOTVERS *\([0-9.]*\).*" "\\1" CGNS_VERSION "${version}") +- unset(version) +-else () +- set(CGNS_VERSION CGNS_VERSION-NOTFOUND) +-endif () +- +-# handle the QUIETLY and REQUIRED arguments and set CGNS_FOUND to TRUE if +-# all listed variables are TRUE +-include(FindPackageHandleStandardArgs) +-find_package_handle_standard_args(CGNS +- REQUIRED_VARS CGNS_INCLUDE_DIR CGNS_LIBRARY +- VERSION_VAR CGNS_VERSION) +- +-if (CGNS_FOUND) +- set(CGNS_LIBRARIES "${CGNS_LIBRARY}") +- set(CGNS_INCLUDE_DIRS "${CGNS_INCLUDE_DIR}") +- if (NOT TARGET CGNS::CGNS) +- add_library(CGNS::CGNS UNKNOWN IMPORTED) +- set_target_properties(CGNS::CGNS PROPERTIES +- IMPORTED_LOCATION "${CGNS_LIBRARY}" +- INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}") +- endif () +-endif () ++# ++# Find the native CGNS includes and library ++# ++# CGNS_INCLUDE_DIR - where to find cgns.h, etc. ++# CGNS_LIBRARIES - List of fully qualified libraries to link against when using CGNS. ++# CGNS_FOUND - Do not attempt to use CGNS if "no" or undefined. ++ ++find_path(CGNS_INCLUDE_DIR ++ NAMES ++ cgnslib.h ++ PATHS ++ /usr/local/include ++ /usr/include ++ DOC "CGNS include directory") ++mark_as_advanced(CGNS_INCLUDE_DIR) ++ ++find_library(CGNS_LIBRARY ++ NAMES ++ cgnsdll cgns ++ DOC "CGNS library") ++mark_as_advanced(CGNS_LIBRARY) ++ ++if (CGNS_INCLUDE_DIR) ++ file(STRINGS "${CGNS_INCLUDE_DIR}/cgnslib.h" version ++ REGEX "CGNS_DOTVERS") ++ string(REGEX REPLACE ".*CGNS_DOTVERS *\([0-9.]*\).*" "\\1" CGNS_VERSION "${version}") ++ unset(version) ++else () ++ set(CGNS_VERSION CGNS_VERSION-NOTFOUND) ++endif () ++ ++# handle the QUIETLY and REQUIRED arguments and set CGNS_FOUND to TRUE if ++# all listed variables are TRUE ++include(FindPackageHandleStandardArgs) ++find_package_handle_standard_args(CGNS ++ REQUIRED_VARS CGNS_INCLUDE_DIR CGNS_LIBRARY ++ VERSION_VAR CGNS_VERSION) ++ ++if (CGNS_FOUND) ++ set(CGNS_LIBRARIES "${CGNS_LIBRARY}") ++ set(CGNS_INCLUDE_DIRS "${CGNS_INCLUDE_DIR}") ++ if (NOT TARGET CGNS::CGNS) ++ add_library(CGNS::CGNS UNKNOWN IMPORTED) ++ set_target_properties(CGNS::CGNS PROPERTIES ++ IMPORTED_LOCATION "${CGNS_LIBRARY}" ++ INTERFACE_INCLUDE_DIRECTORIES "${CGNS_INCLUDE_DIR}") ++ find_package(HDF5 REQUIRED) ++ if(TARGET HDF5::HDF5) ++ set_property(TARGET CGNS::CGNS APPEND PROPERTY ++ INTERFACE_LINK_LIBRARIES "HDF5::HDF5") ++ endif() ++ endif () ++endif () diff --git a/ports/vtk/d107698a.patch b/ports/vtk/d107698a.patch deleted file mode 100644 index 1a7ac087789cd3..00000000000000 --- a/ports/vtk/d107698a.patch +++ /dev/null @@ -1,291 +0,0 @@ -diff --git a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h -index 0b3f1a963063cdf5f1685dbde55deaaea7a77d2f..24198dada846d6d81fb9f1c155e5a6612e1e7055 100644 ---- a/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h -+++ b/Accelerators/Vtkm/Core/vtkmlib/DataArrayConverters.h -@@ -25,6 +25,7 @@ - - #include - #include -+#include - - #include // for std::underlying_type - -diff --git a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx -index ec41b18b60db354a8c4a1532eb5cedfd70ce7534..2493ae5b03cf29c5dfc90614489a8049fc623715 100644 ---- a/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx -+++ b/Accelerators/Vtkm/DataModel/Testing/Cxx/TestVTKMDataSet.cxx -@@ -274,18 +274,19 @@ vtkm::cont::testing::MakeTestDataSet Maker; - void TestUniformDataSet() - { - auto dataset = Maker.Make3DUniformDataSet0(); -- auto coords = -- dataset.GetCoordinateSystem().GetData().Cast(); -+ auto coords = dataset.GetCoordinateSystem() -+ .GetData() -+ .AsArrayHandle(); - auto portal = coords.ReadPortal(); - auto dims = portal.GetDimensions(); - auto origin = portal.GetOrigin(); - auto spacing = portal.GetSpacing(); - - vtkNew pointField, cellField; -- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), -+ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), - "pointvar", pointField); -- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", -- cellField); -+ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), -+ "cellvar", cellField); - - vtkNew imageData; - imageData->SetDimensions(dims[0], dims[1], dims[2]); -@@ -315,10 +316,10 @@ void TestCurvilinearDataSet() - CoordsCopy(dataset.GetCoordinateSystem(), points); - - vtkNew pointField, cellField; -- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), -+ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), - "pointvar", pointField); -- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", -- cellField); -+ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), -+ "cellvar", cellField); - - vtkNew dsVtk; - dsVtk->SetDimensions(dims[0], dims[1], dims[2]); -@@ -357,10 +358,10 @@ void TestExplicitDataSet() - } - - vtkNew pointField, cellField; -- FieldCopy(dataset.GetField("pointvar").GetData().Cast>(), -+ FieldCopy(dataset.GetField("pointvar").GetData().AsArrayHandle>(), - "pointvar", pointField); -- FieldCopy(dataset.GetField("cellvar").GetData().Cast>(), "cellvar", -- cellField); -+ FieldCopy(dataset.GetField("cellvar").GetData().AsArrayHandle>(), -+ "cellvar", cellField); - - vtkNew dsVtk; - dsVtk->SetPoints(points); -diff --git a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx -index 147c3c6e175dbd342095805750bfc4fee81735dc..f1ef72ffae91ca843ca56bdc305ab68bbc955157 100644 ---- a/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx -+++ b/Accelerators/Vtkm/DataModel/vtkmDataSet.cxx -@@ -35,8 +35,7 @@ - #include - #include - #include --#include --#include -+#include - #include - - #include -@@ -62,8 +61,8 @@ struct vtkmDataSet::DataMembers - vtkm::cont::CoordinateSystem Coordinates; - vtkNew Cell; - -- VtkmLocator PointLocator; -- VtkmLocator CellLocator; -+ VtkmLocator PointLocator; -+ VtkmLocator CellLocator; - }; - - //------------------------------------------------------------------------------ -@@ -172,7 +171,7 @@ void vtkmDataSet::GetCellBounds(vtkIdType cellId, double bounds[6]) - this->Internals->CellSet.IsType>()) - { - auto portal = this->Internals->Coordinates.GetData() -- .Cast() -+ .AsArrayHandle() - .ReadPortal(); - - vtkm::internal::ConnectivityStructuredInternals<3> helper; -@@ -279,7 +278,7 @@ vtkIdType vtkmDataSet::FindPoint(double x[3]) - vtkm::Id pointId = -1; - vtkm::FloatDefault d2 = 0; - // exec object created for the Serial device can be called directly -- execLocator->FindNearestNeighbor(point, pointId, d2); -+ execLocator.FindNearestNeighbor(point, pointId, d2); - return pointId; - } - -@@ -316,7 +315,7 @@ vtkIdType vtkmDataSet::FindCell(double x[3], vtkCell*, vtkGenericCell*, vtkIdTyp - vtkm::Vec pc; - vtkm::Id cellId = -1; - // exec object created for the Serial device can be called directly -- execLocator->FindCell(point, cellId, pc); -+ execLocator.FindCell(point, cellId, pc); - - if (cellId >= 0) - { -diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx -index 351c0d5ce169cf455d2d3c0a1307ba8e60510371..c7ecff3c9fc5eafecb9dd11d9dbea15cbd44bd3d 100644 ---- a/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx -+++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImageDataConverter.cxx -@@ -121,7 +121,7 @@ bool Convert( - return false; - } - -- auto points = cs.GetData().Cast(); -+ auto points = cs.GetData().AsArrayHandle(); - auto portal = points.ReadPortal(); - - auto origin = portal.GetOrigin(); -@@ -156,7 +156,7 @@ bool Convert(const vtkm::cont::DataSet& voutput, vtkImageData* output, vtkDataSe - return false; - } - -- auto points = cs.GetData().Cast(); -+ auto points = cs.GetData().AsArrayHandle(); - auto portal = points.ReadPortal(); - - auto dim = portal.GetDimensions(); -diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx -index f2411d0e70505435cd312ee23b3cb2e653eb28d8..814af43cc168b4c3b44107b0c19e68cc1b42538d 100644 ---- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx -+++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.cxx -@@ -52,8 +52,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) - box->GetXMin(xmin); - box->GetXMax(xmax); - -- auto b = new vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); -- this->OutFunction.Reset(b, true); -+ this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); - } - else if ((cylinder = vtkCylinder::SafeDownCast(function))) - { -@@ -62,9 +61,8 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) - cylinder->GetAxis(axis); - radius = cylinder->GetRadius(); - -- auto c = new vtkm::Cylinder( -- MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); -- this->OutFunction.Reset(c, true); -+ this->OutFunction = -+ vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); - } - else if ((plane = vtkPlane::SafeDownCast(function))) - { -@@ -72,8 +70,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) - plane->GetOrigin(origin); - plane->GetNormal(normal); - -- auto p = new vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); -- this->OutFunction.Reset(p, true); -+ this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); - } - else if ((sphere = vtkSphere::SafeDownCast(function))) - { -@@ -81,8 +78,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) - sphere->GetCenter(center); - radius = sphere->GetRadius(); - -- auto s = new vtkm::Sphere(MakeFVec3(center), static_cast(radius)); -- this->OutFunction.Reset(s, true); -+ this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast(radius)); - } - else - { -@@ -95,7 +91,7 @@ void ImplicitFunctionConverter::Set(vtkImplicitFunction* function) - this->InFunction = function; - } - --const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const -+const vtkm::ImplicitFunctionGeneral& ImplicitFunctionConverter::Get() - { - if (this->InFunction && (this->MTime < this->InFunction->GetMTime())) - { -@@ -110,9 +106,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const - box->GetXMin(xmin); - box->GetXMax(xmax); - -- auto b = static_cast(this->OutFunction.Get()); -- b->SetMinPoint(MakeFVec3(xmin)); -- b->SetMaxPoint(MakeFVec3(xmax)); -+ this->OutFunction = vtkm::Box(MakeFVec3(xmin), MakeFVec3(xmax)); - } - else if ((cylinder = vtkCylinder::SafeDownCast(this->InFunction))) - { -@@ -121,10 +115,8 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const - cylinder->GetAxis(axis); - radius = cylinder->GetRadius(); - -- auto c = static_cast(this->OutFunction.Get()); -- c->SetCenter(MakeFVec3(center)); -- c->SetAxis(MakeFVec3(axis)); -- c->SetRadius(static_cast(radius)); -+ this->OutFunction = -+ vtkm::Cylinder(MakeFVec3(center), MakeFVec3(axis), static_cast(radius)); - } - else if ((plane = vtkPlane::SafeDownCast(this->InFunction))) - { -@@ -132,9 +124,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const - plane->GetOrigin(origin); - plane->GetNormal(normal); - -- auto p = static_cast(this->OutFunction.Get()); -- p->SetOrigin(MakeFVec3(origin)); -- p->SetNormal(MakeFVec3(normal)); -+ this->OutFunction = vtkm::Plane(MakeFVec3(origin), MakeFVec3(normal)); - } - else if ((sphere = vtkSphere::SafeDownCast(this->InFunction))) - { -@@ -142,9 +132,7 @@ const vtkm::cont::ImplicitFunctionHandle& ImplicitFunctionConverter::Get() const - sphere->GetCenter(center); - radius = sphere->GetRadius(); - -- auto s = static_cast(this->OutFunction.Get()); -- s->SetCenter(MakeFVec3(center)); -- s->SetRadius(static_cast(radius)); -+ this->OutFunction = vtkm::Sphere(MakeFVec3(center), static_cast(radius)); - } - - this->MTime = this->InFunction->GetMTime(); -diff --git a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h -index 10e2ae99ae819ca86516bf7ab5a0988c75b6323e..a1a571c93d44a7d62f79afc86aab05d1f359af82 100644 ---- a/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h -+++ b/Accelerators/Vtkm/DataModel/vtkmlib/ImplicitFunctionConverter.h -@@ -20,7 +20,7 @@ - #include "vtkType.h" // For vtkMTimeType - #include "vtkmConfigDataModel.h" //required for general vtkm setup - --#include "vtkm/cont/ImplicitFunctionHandle.h" -+#include "vtkm/ImplicitFunction.h" - - class vtkImplicitFunction; - -@@ -33,11 +33,11 @@ public: - ImplicitFunctionConverter(); - - void Set(vtkImplicitFunction*); -- const vtkm::cont::ImplicitFunctionHandle& Get() const; -+ const vtkm::ImplicitFunctionGeneral& Get(); - - private: - vtkImplicitFunction* InFunction; -- vtkm::cont::ImplicitFunctionHandle OutFunction; -+ vtkm::ImplicitFunctionGeneral OutFunction; - mutable vtkMTimeType MTime; - }; - -diff --git a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx -index 04a637a92d487b019742bbf81884750c48ba105d..674d9b6e0dfe36edd787e519e70ec0bf46602c81 100644 ---- a/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx -+++ b/Accelerators/Vtkm/Filters/vtkmClipInstantiationsWithImplicitFunction.cxx -@@ -24,12 +24,9 @@ vtkm::cont::DataSet vtkmClip::internals::ExecuteClipWithImplicitFunction(vtkm::c - auto function = this->ClipFunctionConverter->Get(); - - vtkm::cont::DataSet result; -- if (function.GetValid()) -- { -- vtkm::filter::ClipWithImplicitFunction functionFilter; -- functionFilter.SetImplicitFunction(function); -- result = functionFilter.Execute(in); -- } -+ vtkm::filter::ClipWithImplicitFunction functionFilter; -+ functionFilter.SetImplicitFunction(function); -+ result = functionFilter.Execute(in); - - return result; - } diff --git a/ports/vtk/fix-find-libharu.patch b/ports/vtk/fix-find-libharu.patch deleted file mode 100644 index 2257c500380395..00000000000000 --- a/ports/vtk/fix-find-libharu.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/CMake/vtkInstallCMakePackage.cmake b/CMake/vtkInstallCMakePackage.cmake -index bcb20446c2..24c06ed8ad 100644 ---- a/CMake/vtkInstallCMakePackage.cmake -+++ b/CMake/vtkInstallCMakePackage.cmake -@@ -62,7 +62,6 @@ set(vtk_cmake_module_files - FindGLEW.cmake - FindJOGL.cmake - FindJsonCpp.cmake -- FindLibHaru.cmake - FindLibPROJ.cmake - FindLibXml2.cmake - FindLZ4.cmake -diff --git a/ThirdParty/libharu/CMakeLists.txt b/ThirdParty/libharu/CMakeLists.txt -index bac8dce188..44004fd9bb 100644 ---- a/ThirdParty/libharu/CMakeLists.txt -+++ b/ThirdParty/libharu/CMakeLists.txt -@@ -4,16 +4,15 @@ vtk_module_third_party( - VERSION "2.4.0" - STANDARD_INCLUDE_DIRS - EXTERNAL -- PACKAGE LibHaru -+ PACKAGE unofficial-libharu CONFIG_MODE - # Unreleased. Requires these PRs: - # https://github.com/libharu/libharu/pull/157 - # https://github.com/libharu/libharu/pull/187 -- VERSION 2.4.0 -- TARGETS LibHaru::LibHaru -+ TARGETS unofficial::libharu::hpdf - STANDARD_INCLUDE_DIRS) - - include(vtkDetectLibraryType) --vtk_detect_library_shared(vtklibharu LibHaru::LibHaru) -+vtk_detect_library_shared(vtklibharu unofficial::libharu::hpdf) - - set(HPDF_DLL 0) - if (WIN32 AND vtklibharu_is_shared) diff --git a/ports/vtk/fix-libharu2.4-compat.patch b/ports/vtk/fix-libharu2.4-compat.patch deleted file mode 100644 index 493383823974e0..00000000000000 --- a/ports/vtk/fix-libharu2.4-compat.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/IO/ExportPDF/vtkPDFContextDevice2D.cxx b/IO/ExportPDF/vtkPDFContextDevice2D.cxx -index a51945dc9b..1cbc3945af 100644 ---- a/IO/ExportPDF/vtkPDFContextDevice2D.cxx -+++ b/IO/ExportPDF/vtkPDFContextDevice2D.cxx -@@ -1631,21 +1631,21 @@ void vtkPDFContextDevice2D::ApplyLineWidth(float width) - void vtkPDFContextDevice2D::ApplyLineType(int type) - { - // These match the OpenGL2 implementation: -- static const HPDF_UINT16 noPen[] = { 0, 10 }; -+ static const HPDF_REAL noPen[] = { 0, 10 }; - static const HPDF_UINT noPenLen = 2; - -- static const HPDF_UINT16 dash[] = { 8 }; -+ static const HPDF_REAL dash[] = { 8 }; - static const HPDF_UINT dashLen = 1; - -- static const HPDF_UINT16 dot[] = { 1, 7 }; -- static const HPDF_UINT16 denseDot[] = { 1, 3 }; -+ static const HPDF_REAL dot[] = { 1, 7 }; -+ static const HPDF_REAL denseDot[] = { 1, 3 }; - static const HPDF_UINT dotLen = 2; - -- static const HPDF_UINT16 dashDot[] = { 4, 6, 2, 4 }; -+ static const HPDF_REAL dashDot[] = { 4, 6, 2, 4 }; - static const HPDF_UINT dashDotLen = 4; - - // This is dash-dot-dash, but eh. It matches the OpenGL2 0x1C47 pattern. -- static const HPDF_UINT16 dashDotDot[] = { 3, 3, 1, 3, 3, 3 }; -+ static const HPDF_REAL dashDotDot[] = { 3, 3, 1, 3, 3, 3 }; - static const HPDF_UINT dashDotDotLen = 6; - - switch (type) diff --git a/ports/vtk/iotr.patch b/ports/vtk/iotr.patch new file mode 100644 index 00000000000000..10ee575364de36 --- /dev/null +++ b/ports/vtk/iotr.patch @@ -0,0 +1,12 @@ +diff --git a/IO/IOSS/vtkIOSSUtilities.cxx b/IO/IOSS/vtkIOSSUtilities.cxx +index 26470b965..bee76107a 100644 +--- a/IO/IOSS/vtkIOSSUtilities.cxx ++++ b/IO/IOSS/vtkIOSSUtilities.cxx +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + + #include + diff --git a/ports/vtk/jsoncpp.patch b/ports/vtk/jsoncpp.patch new file mode 100644 index 00000000000000..e92acb9b7534c7 --- /dev/null +++ b/ports/vtk/jsoncpp.patch @@ -0,0 +1,12 @@ +diff --git a/ThirdParty/jsoncpp/CMakeLists.txt b/ThirdParty/jsoncpp/CMakeLists.txt +index a9581f862..ad17b7323 100644 +--- a/ThirdParty/jsoncpp/CMakeLists.txt ++++ b/ThirdParty/jsoncpp/CMakeLists.txt +@@ -8,7 +8,6 @@ vtk_module_third_party( + VERSION "1.9.4" + STANDARD_INCLUDE_DIRS + EXTERNAL + PACKAGE JsonCpp +- VERSION 0.7.0 + TARGETS JsonCpp::JsonCpp + STANDARD_INCLUDE_DIRS) diff --git a/ports/vtk/missing-limits.patch b/ports/vtk/missing-limits.patch deleted file mode 100644 index 2450e480cfcf44..00000000000000 --- a/ports/vtk/missing-limits.patch +++ /dev/null @@ -1,48 +0,0 @@ -diff --git a/Common/Core/vtkGenericDataArrayLookupHelper.h b/Common/Core/vtkGenericDataArrayLookupHelper.h -index ab9d572..202aaa2 100644 ---- a/Common/Core/vtkGenericDataArrayLookupHelper.h -+++ b/Common/Core/vtkGenericDataArrayLookupHelper.h -@@ -25,6 +25,7 @@ - #include "vtkIdList.h" - #include - #include -+#include - #include - #include - -diff --git a/Common/DataModel/vtkPiecewiseFunction.cxx b/Common/DataModel/vtkPiecewiseFunction.cxx -index 22eca0b..11086f1 100644 ---- a/Common/DataModel/vtkPiecewiseFunction.cxx -+++ b/Common/DataModel/vtkPiecewiseFunction.cxx -@@ -22,6 +22,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -index a16bb27..1052192 100644 ---- a/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -+++ b/Filters/HyperTree/vtkHyperTreeGridThreshold.cxx -@@ -27,6 +27,7 @@ - #include "vtkHyperTreeGridNonOrientedCursor.h" - - #include -+#include - - vtkStandardNewMacro(vtkHyperTreeGridThreshold); - -diff --git a/Rendering/Core/vtkColorTransferFunction.cxx b/Rendering/Core/vtkColorTransferFunction.cxx -index 55c046b..1be0291 100644 ---- a/Rendering/Core/vtkColorTransferFunction.cxx -+++ b/Rendering/Core/vtkColorTransferFunction.cxx -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - #include - #include - diff --git a/ports/vtk/portfile.cmake b/ports/vtk/portfile.cmake index 4013f6a5cc4560..b10b1428d08e09 100644 --- a/ports/vtk/portfile.cmake +++ b/ports/vtk/portfile.cmake @@ -1,14 +1,22 @@ +set(VTK_SHORT_VERSION 9.2) if(NOT VCPKG_TARGET_IS_WINDOWS) message(WARNING "You will need to install Xorg dependencies to build vtk:\napt-get install libxt-dev\n") endif() +vcpkg_download_distfile( + STRING_PATCH + URLS https://gitlab.kitware.com/vtk/vtk/-/commit/bfa3e4c7621ddf5826755536eb07284c86db6474.diff + FILENAME vtk-string-bfa3e4.diff + SHA512 c5ccb1193e4e61cf78b63802f87ffb09349c5566ad8a4d51418133953f7acd6b4a206f8d41a426a9eb9be3cf1fd95242e6402973252d7979e5a9cb5e5e480d78 +) + # ============================================================================= # Clone & patch vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO Kitware/VTK - REF 2959413ff190bc6e3ff40f5b6c1342edd2e5233f # v9.0.x used by ParaView 5.9.1 - SHA512 16229c107ed904e8fa6850c3814b8bdcdf9700ef44f6ff5b3a77e7d793ce19954fc2c7b1219a0162cf588def6e990883cd3f808c316a4db6e65bd6cd1769dd3f + REF 66143ef041b980a51e41ee470d053e67209150f8 # v9.2.x used by ParaView 5.11.0 + SHA512 70662670622082bb8d8b16765bbdf645cfbe62151e93b9673c6f94b356df66ca003e5c78b45e99385f1630aed39c3a8eddecd1d9f5bc0cfb92f5e7e8c06e4dbb HEAD_REF master PATCHES FindLZMA.patch @@ -17,21 +25,18 @@ vcpkg_from_github( pegtl.patch pythonwrapper.patch # Required by ParaView to Wrap required classes NoUndefDebug.patch # Required to link against correct Python library depending on build type. - python_debug.patch fix-using-hdf5.patch # CHECK: module-name-mangling.patch # Last patch TODO: Patch out internal loguru FindExpat.patch # The find_library calls are taken care of by vcpkg-cmake-wrapper.cmake of expat - # upstream vtkm patches to make it work with vtkm 1.6 - vtkm.patch # To include an external VTKm build - 1f00a0c9.patch - 156fb524.patch - d107698a.patch - fix-gdal.patch - missing-limits.patch # This patch can be removed in next version. Since it has been merged to upstream via https://gitlab.kitware.com/vtk/vtk/-/merge_requests/7611 - UseProj5Api.patch # Allow Proj 8.0+ (commit b66e4a7, backported). Should be in soon after 9.0.3 - fix-find-libharu.patch - fix-libharu2.4-compat.patch + # fix-gdal.patch TODO? + cgns.patch + vtkm.patch + afxdll.patch + vtkioss.patch + jsoncpp.patch + iotr.patch + ${STRING_PATCH} ) # ============================================================================= @@ -43,6 +48,20 @@ file(COPY "${CURRENT_PORT_DIR}/FindHDF5.cmake" DESTINATION "${SOURCE_PATH}/CMake # Options: # Collect CMake options for optional components +if("atlmfc" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_GUISupportMFC=YES + ) +endif() +if("vtkm" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmCore=YES + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmDataModel=YES + -DVTK_MODULE_ENABLE_VTK_AcceleratorsVTKmFilters=YES + -DVTK_MODULE_ENABLE_VTK_vtkm=YES + ) +endif() + # TODO: # - add loguru as a dependency requires #8682 vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS @@ -72,6 +91,7 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS "paraview" VTK_MODULE_ENABLE_VTK_RenderingAnnotation "paraview" VTK_MODULE_ENABLE_VTK_DomainsChemistry "paraview" VTK_MODULE_ENABLE_VTK_FiltersParallelDIY2 + "paraview" VTK_MODULE_ENABLE_VTK_cli11 "mpi" VTK_GROUP_ENABLE_MPI "opengl" VTK_MODULE_ENABLE_VTK_ImagingOpenGL2 "opengl" VTK_MODULE_ENABLE_VTK_RenderingGL2PSOpenGL2 @@ -87,13 +107,24 @@ vcpkg_check_features(OUT_FEATURE_OPTIONS VTK_FEATURE_OPTIONS list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=ON" "=YES") list(TRANSFORM VTK_FEATURE_OPTIONS REPLACE "=OFF" "=DONT_WANT") +if("qt" IN_LIST FEATURES AND NOT EXISTS "${CURRENT_HOST_INSTALLED_DIR}/tools/Qt5/bin/qmlplugindump${VCPKG_HOST_EXECUTABLE_SUFFIX}") + list(APPEND VTK_FEATURE_OPTIONS -DVTK_MODULE_ENABLE_VTK_GUISupportQtQuick=NO) +endif() + + if("python" IN_LIST FEATURES) - vcpkg_find_acquire_program(PYTHON3) + set(python_ver "") + if(NOT VCPKG_TARGET_IS_WINDOWS) + set(python_ver 3.10) + endif() list(APPEND ADDITIONAL_OPTIONS -DVTK_WRAP_PYTHON=ON -DVTK_PYTHON_VERSION=3 -DPython3_FIND_REGISTRY=NEVER - "-DPython3_EXECUTABLE:PATH=${PYTHON3}" + "-DPython3_EXECUTABLE:PATH=${CURRENT_HOST_INSTALLED_DIR}/tools/python3/python${python_ver}${VCPKG_EXECUTABLE_SUFFIX}" + -DVTK_MODULE_ENABLE_VTK_Python=YES + -DVTK_MODULE_ENABLE_VTK_PythonContext2D=YES # TODO: recheck + -DVTK_MODULE_ENABLE_VTK_PythonInterpreter=YES ) #VTK_PYTHON_SITE_PACKAGES_SUFFIX should be set to the install dir of the site-packages endif() @@ -102,13 +133,21 @@ if ("paraview" IN_LIST FEATURES OR "opengl" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS -DVTK_MODULE_ENABLE_VTK_RenderingContextOpenGL2=YES -DVTK_MODULE_ENABLE_VTK_RenderingLICOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_RenderingAnnotation=YES -DVTK_MODULE_ENABLE_VTK_DomainsChemistryOpenGL2=YES + -DVTK_MODULE_ENABLE_VTK_FiltersParallelDIY2=YES ) endif() -if("paraview" IN_LIST FEATURES AND "python" IN_LIST FEATURES) +if ("paraview" IN_LIST FEATURES AND "python" IN_LIST FEATURES) list(APPEND ADDITIONAL_OPTIONS - -DVTK_MODULE_ENABLE_VTK_RenderingMatplotlib=YES + -DVTK_MODULE_ENABLE_VTK_WebCore=YES + ) +endif() + +if("paraview" IN_LIST FEATURES AND "mpi" IN_LIST FEATURES) + list(APPEND ADDITIONAL_OPTIONS + -DVTK_MODULE_ENABLE_VTK_FiltersParallelFlowPaths=YES ) endif() @@ -141,14 +180,16 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - "cuda" VTK_USE_CUDA - "mpi" VTK_USE_MPI - "all" VTK_BUILD_ALL_MODULES + "cuda" VTK_USE_CUDA + "mpi" VTK_USE_MPI + "all" VTK_BUILD_ALL_MODULES ) # ============================================================================= # Configure & Install + + # We set all libraries to "system" and explicitly list the ones that should use embedded copies vcpkg_cmake_configure( SOURCE_PATH "${SOURCE_PATH}" @@ -168,9 +209,18 @@ vcpkg_cmake_configure( # Select modules / groups to install -DVTK_USE_EXTERNAL:BOOL=ON -DVTK_MODULE_USE_EXTERNAL_VTK_gl2ps:BOOL=OFF # Not yet in VCPKG + #-DVTK_MODULE_ENABLE_VTK_jsoncpp=YES ${ADDITIONAL_OPTIONS} -DVTK_DEBUG_MODULE_ALL=ON -DVTK_DEBUG_MODULE=ON + -DVTK_QT_VERSION=5 + -DCMAKE_INSTALL_QMLDIR:PATH=qml + -DVCPKG_HOST_TRIPLET=${_HOST_TRIPLET} + MAYBE_UNUSED_VARIABLES + VTK_MODULE_ENABLE_VTK_PythonContext2D # Guarded by a conditional + VTK_MODULE_ENABLE_VTK_GUISupportMFC # only windows + VTK_QT_VERSION # Only with Qt + CMAKE_INSTALL_QMLDIR ) vcpkg_cmake_install() @@ -178,7 +228,7 @@ vcpkg_copy_pdbs() # ============================================================================= # Fixup target files -vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vtk-9.0) +vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/vtk-${VTK_SHORT_VERSION}) # ============================================================================= # Clean-up other directories @@ -220,7 +270,6 @@ function(_vtk_move_release_tool TOOL_NAME) endif() endfunction() -set(VTK_SHORT_VERSION 9.0) set(VTK_TOOLS vtkEncodeString-${VTK_SHORT_VERSION} vtkHashSource-${VTK_SHORT_VERSION} @@ -266,8 +315,8 @@ if("paraview" IN_LIST FEATURES) file(INSTALL "${SOURCE_PATH}/CMake/vtkRequireLargeFilesSupport.cxx" DESTINATION "${CURRENT_PACKAGES_DIR}/share/vtk") file(INSTALL "${SOURCE_PATH}/Rendering/Volume/vtkBlockSortHelper.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") # this should get installed by VTK file(INSTALL "${SOURCE_PATH}/Filters/ParallelDIY2/vtkDIYKdTreeUtilities.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") - file(INSTALL "${SOURCE_PATH}/Parallel/DIY/vtkDIYUtilities.txx" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") + file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/Parallel/vtkCompositeZPassFS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") file(INSTALL "${CURRENT_BUILDTREES_DIR}/${TARGET_TRIPLET}-rel/Rendering/OpenGL2/vtkTextureObjectVS.h" DESTINATION "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}") endif() @@ -299,8 +348,8 @@ file(REMOVE "${CURRENT_PACKAGES_DIR}/share/${PORT}/FindEXPAT.cmake") file(RENAME "${CURRENT_PACKAGES_DIR}/share/licenses" "${CURRENT_PACKAGES_DIR}/share/${PORT}/licenses") -if(EXISTS "${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h") - vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/vtk-9.0/vtkChemistryConfigure.h" "${SOURCE_PATH}" "not/existing") +if(EXISTS "${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}/vtkChemistryConfigure.h") + vcpkg_replace_string("${CURRENT_PACKAGES_DIR}/include/vtk-${VTK_SHORT_VERSION}/vtkChemistryConfigure.h" "${SOURCE_PATH}" "not/existing") endif() # ============================================================================= # Usage diff --git a/ports/vtk/python_debug.patch b/ports/vtk/python_debug.patch deleted file mode 100644 index 6b69d8094dd597..00000000000000 --- a/ports/vtk/python_debug.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMake/patches/3.18/FindPython/Support.cmake b/CMake/patches/3.18/FindPython/Support.cmake -index 0879537ed..122e7228d 100644 ---- a/CMake/patches/3.18/FindPython/Support.cmake -+++ b/CMake/patches/3.18/FindPython/Support.cmake -@@ -2253,7 +2257,7 @@ if (("Development.Module" IN_LIST ${_PYTHON_PREFIX}_FIND_COMPONENTS - NAMES ${_${_PYTHON_PREFIX}_LIB_NAMES_DEBUG} - NAMES_PER_DIR - HINTS "${_${_PYTHON_PREFIX}_PATH}" ${_${_PYTHON_PREFIX}_HINTS} -- NO_DEFAULT_PATH) -+ ) - endif() - - # retrieve runtime libraries diff --git a/ports/vtk/vcpkg.json b/ports/vtk/vcpkg.json index 1666a05ca58867..315e703a90e835 100644 --- a/ports/vtk/vcpkg.json +++ b/ports/vtk/vcpkg.json @@ -1,7 +1,6 @@ { "name": "vtk", - "version-semver": "9.0.3-pv5.9.1", - "port-version": 12, + "version-semver": "9.2.0-pv5.11.0", "description": "Software system for 3D computer graphics, image processing, and visualization", "homepage": "https://github.com/Kitware/VTK", "license": "BSD-3-Clause", @@ -9,6 +8,8 @@ "double-conversion", "eigen3", "expat", + "exprtk", + "fmt", "freetype", "glew", { @@ -16,7 +17,10 @@ "default-features": false }, "jsoncpp", - "libharu", + { + "name": "libharu", + "version>=": "2.4.3" + }, "libjpeg-turbo", "liblzma", "libogg", @@ -28,7 +32,15 @@ "pegtl-2", "proj", "pugixml", + { + "name": "seacas", + "default-features": false + }, "sqlite3", + { + "name": "sqlite3", + "host": true + }, "tiff", "utfcpp", { @@ -39,6 +51,7 @@ "name": "vcpkg-cmake-config", "host": true }, + "verdict", "zlib" ], "features": { @@ -111,6 +124,20 @@ ] }, "mpi", + { + "name": "seacas", + "default-features": false, + "features": [ + "mpi" + ] + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "vtkm" + ] + }, { "name": "vtk-m", "default-features": false, @@ -139,6 +166,7 @@ "paraview": { "description": "Build vtk modules required by paraview", "dependencies": [ + "cli11", { "name": "vtk", "default-features": false, @@ -159,19 +187,23 @@ "python": { "description": "Python functionality for VTK", "dependencies": [ - "python3" + "python3", + { + "name": "python3", + "host": true + } ] }, "qt": { "description": "Qt functionality for VTK", "dependencies": [ + "qt5-declarative", "qt5-imageformats", "qt5-tools", { "name": "qt5-x11extras", "platform": "linux" - }, - "qt5-xmlpatterns" + } ] }, "utf8": { diff --git a/ports/vtk/vtkioss.patch b/ports/vtk/vtkioss.patch new file mode 100644 index 00000000000000..521b2769494fa9 --- /dev/null +++ b/ports/vtk/vtkioss.patch @@ -0,0 +1,43 @@ +diff --git a/IO/IOSS/vtkIOSSReader.cxx b/IO/IOSS/vtkIOSSReader.cxx +index 34218f0a6..226896a9e 100644 +--- a/IO/IOSS/vtkIOSSReader.cxx ++++ b/IO/IOSS/vtkIOSSReader.cxx +@@ -1343,20 +1343,20 @@ Ioss::Region* vtkIOSSReader::vtkInternals::GetRegion(const std::string& dbasenam + { + switch (properties.get(name).get_type()) + { +- case vtkioss_Ioss::Property::BasicType::POINTER: ++ case Ioss::Property::BasicType::POINTER: + vtkLog(TRACE, << name << " : " << properties.get(name).get_pointer()); + break; +- case vtkioss_Ioss::Property::BasicType::INTEGER: ++ case Ioss::Property::BasicType::INTEGER: + vtkLog(TRACE, << name << " : " << std::to_string(properties.get(name).get_int())); + break; +- case vtkioss_Ioss::Property::BasicType::INVALID: ++ case Ioss::Property::BasicType::INVALID: + vtkLog(TRACE, << name << " : " + << "invalid type"); + break; +- case vtkioss_Ioss::Property::BasicType::REAL: ++ case Ioss::Property::BasicType::REAL: + vtkLog(TRACE, << name << " : " << std::to_string(properties.get(name).get_real())); + break; +- case vtkioss_Ioss::Property::BasicType::STRING: ++ case Ioss::Property::BasicType::STRING: + vtkLog(TRACE, << name << " : " << properties.get(name).get_string()); + break; + default: +diff --git a/ThirdParty/ioss/CMakeLists.txt b/ThirdParty/ioss/CMakeLists.txt +index 3066c4bb5..44e1eb1bf 100644 +--- a/ThirdParty/ioss/CMakeLists.txt ++++ b/ThirdParty/ioss/CMakeLists.txt +@@ -5,7 +5,7 @@ vtk_module_third_party( + STANDARD_INCLUDE_DIRS + EXTERNAL + PACKAGE SEACASIoss +- TARGETS Ioss ++ TARGETS Ioss Ionit + USE_VARIABLES SEACASIoss_INCLUDE_DIRS + STANDARD_INCLUDE_DIRS) + diff --git a/ports/vtk/vtkm.patch b/ports/vtk/vtkm.patch index 72c8ce2bd3495d..39d325b5f17f8c 100644 --- a/ports/vtk/vtkm.patch +++ b/ports/vtk/vtkm.patch @@ -1,95 +1,81 @@ diff --git a/Accelerators/Vtkm/Core/CMakeLists.txt b/Accelerators/Vtkm/Core/CMakeLists.txt -index b889a771f..317d83f75 100644 +index 397dca9f6..bc9c62ac5 100644 --- a/Accelerators/Vtkm/Core/CMakeLists.txt +++ b/Accelerators/Vtkm/Core/CMakeLists.txt -@@ -14,8 +14,9 @@ - ## - ##============================================================================= +@@ -16,8 +16,7 @@ --list(INSERT 0 CMAKE_MODULE_PATH + set(VTKm_NO_DEPRECATED_VIRTUAL ON) + +-list(INSERT CMAKE_MODULE_PATH 0 - "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") +find_package(VTKm CONFIG REQUIRED) -+#list(INSERT 0 CMAKE_MODULE_PATH -+# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") set(private_headers - vtkmlib/DataArrayConverters.hxx -@@ -77,9 +78,9 @@ vtkm_add_target_information(${vtkm_accel_target} + vtkmFilterPolicy.h +@@ -65,9 +64,6 @@ vtkm_add_target_information(${vtkm_accel_target} + EXTENDS_VTKM MODIFY_CUDA_FLAGS DEVICE_SOURCES ${sources}) - -vtk_module_set_property(VTK::AcceleratorsVTKmCore - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) -+#vtk_module_set_property(VTK::AcceleratorsVTKmCore -+# PROPERTY JOB_POOL_COMPILE -+# VALUE vtkm_pool) - if (TARGET vtkm::cuda) - vtk_module_set_property(VTK::AcceleratorsVTKmCore + if (TARGET vtkm::kokkos_hip) + list(TRANSFORM nowrap_classes APPEND ".cxx" OUTPUT_VARIABLE hip_impl) diff --git a/Accelerators/Vtkm/DataModel/CMakeLists.txt b/Accelerators/Vtkm/DataModel/CMakeLists.txt -index 56307be8d..30fff98e8 100644 +index 9d5dfe100..7fea257b7 100644 --- a/Accelerators/Vtkm/DataModel/CMakeLists.txt +++ b/Accelerators/Vtkm/DataModel/CMakeLists.txt -@@ -14,8 +14,9 @@ - ## - ##============================================================================= +@@ -16,8 +16,7 @@ --list(INSERT 0 CMAKE_MODULE_PATH + set(VTKm_NO_DEPRECATED_VIRTUAL ON) + +-list(INSERT CMAKE_MODULE_PATH 0 - "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") +find_package(VTKm CONFIG REQUIRED) -+#list(INSERT 0 CMAKE_MODULE_PATH -+# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") set(sources vtkmlib/ArrayConvertersReal.cxx -@@ -85,9 +86,9 @@ vtkm_add_target_information(${vtkm_accel_target} +@@ -72,10 +71,6 @@ vtkm_add_target_information(${vtkm_accel_target} MODIFY_CUDA_FLAGS DEVICE_SOURCES ${sources}) -vtk_module_set_property(VTK::AcceleratorsVTKmDataModel - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) -+#vtk_module_set_property(VTK::AcceleratorsVTKmDataModel -+# PROPERTY JOB_POOL_COMPILE -+# VALUE vtkm_pool) - +- if (TARGET vtkm::cuda) - vtk_module_set_property(VTK::AcceleratorsVTKmDataModel + set(cuda_impl ${nowrap_classes} vtkmDataSet.cxx) + set_source_files_properties(${cuda_impl} PROPERTIES diff --git a/Accelerators/Vtkm/Filters/CMakeLists.txt b/Accelerators/Vtkm/Filters/CMakeLists.txt -index 14e84f1dd..0a931285d 100644 +index 0f51c436d..567b49197 100644 --- a/Accelerators/Vtkm/Filters/CMakeLists.txt +++ b/Accelerators/Vtkm/Filters/CMakeLists.txt -@@ -14,8 +14,9 @@ - ## - ##============================================================================= +@@ -16,8 +16,7 @@ + + set(VTKm_NO_DEPRECATED_VIRTUAL ON) --list(INSERT 0 CMAKE_MODULE_PATH +-list(INSERT CMAKE_MODULE_PATH 0 - "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") +find_package(VTKm CONFIG REQUIRED) -+#list(INSERT 0 CMAKE_MODULE_PATH -+# "${VTK_SOURCE_DIR}/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake") - set(impl_classes + set(classes vtkmAverageToCells -@@ -80,9 +81,9 @@ vtkm_add_target_information(${vtkm_accel_target} +@@ -118,9 +117,6 @@ vtkm_add_target_information(${vtkm_accel_target} MODIFY_CUDA_FLAGS DEVICE_SOURCES ${sources}) -vtk_module_set_property(VTK::AcceleratorsVTKmFilters - PROPERTY JOB_POOL_COMPILE - VALUE vtkm_pool) -+#vtk_module_set_property(VTK::AcceleratorsVTKmFilters -+# PROPERTY JOB_POOL_COMPILE -+# VALUE vtkm_pool) vtk_module_link(VTK::AcceleratorsVTKmFilters PRIVATE vtkm_worklet diff --git a/CMake/vtk-config.cmake.in b/CMake/vtk-config.cmake.in -index 5a5e8b8df..96413875f 100644 +index a8c40085a..764298f0e 100644 --- a/CMake/vtk-config.cmake.in +++ b/CMake/vtk-config.cmake.in -@@ -121,9 +121,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@") +@@ -126,9 +126,7 @@ set("${CMAKE_FIND_PACKAGE_NAME}_AVAILABLE_COMPONENTS" "@vtk_all_components@") unset("${CMAKE_FIND_PACKAGE_NAME}_FOUND") set("${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm" "@vtk_has_vtkm@") if (${CMAKE_FIND_PACKAGE_NAME}_HAS_VTKm) @@ -101,13 +87,13 @@ index 5a5e8b8df..96413875f 100644 set("${CMAKE_FIND_PACKAGE_NAME}_FOUND" 0) endif () diff --git a/ThirdParty/vtkm/CMakeLists.txt b/ThirdParty/vtkm/CMakeLists.txt -index 5817d42f8..f21d17da8 100644 +index 8cfbf92b0..ad78cc8f5 100644 --- a/ThirdParty/vtkm/CMakeLists.txt +++ b/ThirdParty/vtkm/CMakeLists.txt @@ -1,6 +1,41 @@ -vtk_module_third_party_internal( - LICENSE_FILES "vtkvtkm/vtk-m/LICENSE.txt" -- VERSION "master" +- VERSION "1.7.1" - SUBDIRECTORY vtkvtkm - STANDARD_INCLUDE_DIRS - INTERFACE) @@ -152,7 +138,6 @@ index 5817d42f8..f21d17da8 100644 + #LIBRARIES vtkm_cont vtkm_filter vtkm_diy vtkm_optionparser vtkm_taotuple + INCLUDE_DIRS VTKm_INCLUDE_DIRS VTKm_DIY_INCLUDE_DIRS VTKm_OPTION_INCLUDE_DIRS +) -\ No newline at end of file diff --git a/ThirdParty/vtkm/vtk.module b/ThirdParty/vtkm/vtk.module index a8e4dad0f..c7bbbf0e8 100644 --- a/ThirdParty/vtkm/vtk.module diff --git a/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json index cc1e43306cccd8..d0c7c1bcc24fbd 100644 --- a/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json +++ b/scripts/test_ports/vcpkg-ci-paraview/vcpkg.json @@ -1,9 +1,9 @@ { "name": "vcpkg-ci-paraview", - "version-string": "1", - "port-version": 3, + "version-date": "2022-12-01", "description": "Port to force features of certain ports within CI", "homepage": "https://github.com/microsoft/vcpkg", + "license": "MIT", "dependencies": [ { "name": "paraview", @@ -13,6 +13,32 @@ ], "platform": "x86 & windows" }, + { + "name": "paraview", + "default-features": false, + "features": [ + "python", + "mpi" + ], + "platform": "!(windows & static) & !x86" + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "gdal", + "utf8" + ], + "platform": "!x86" + }, + { + "name": "vtk", + "default-features": false, + "features": [ + "openvr" + ], + "platform": "!osx & !(windows & staticcrt)" + }, { "name": "paraview", "default-features": false, diff --git a/versions/baseline.json b/versions/baseline.json index c5613cb2fac5e1..ee3e518fe2e228 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -1394,7 +1394,7 @@ }, "cgns": { "baseline": "4.3.0", - "port-version": 2 + "port-version": 3 }, "chaiscript": { "baseline": "6.1.0", @@ -2934,7 +2934,7 @@ }, "hdf5": { "baseline": "1.12.2", - "port-version": 4 + "port-version": 5 }, "healpix": { "baseline": "1.12.10", @@ -4850,7 +4850,7 @@ }, "matio": { "baseline": "1.5.23", - "port-version": 0 + "port-version": 1 }, "matplotlib-cpp": { "baseline": "2020-08-27", @@ -5574,7 +5574,7 @@ }, "opencv4": { "baseline": "4.7.0", - "port-version": 0 + "port-version": 1 }, "opendnp3": { "baseline": "3.1.1", @@ -5606,7 +5606,7 @@ }, "openimageio": { "baseline": "2.4.5.0", - "port-version": 1 + "port-version": 2 }, "openjpeg": { "baseline": "2.5.0", @@ -5785,8 +5785,8 @@ "port-version": 1 }, "paraview": { - "baseline": "5.9.1", - "port-version": 2 + "baseline": "5.11.0", + "port-version": 0 }, "parmetis": { "baseline": "2022-07-27", @@ -6960,6 +6960,10 @@ "baseline": "0.16.1", "port-version": 6 }, + "seacas": { + "baseline": "2022-11-22", + "port-version": 0 + }, "seal": { "baseline": "4.1.1", "port-version": 0 @@ -8000,6 +8004,10 @@ "baseline": "2.02.00", "port-version": 0 }, + "verdict": { + "baseline": "1.4.0", + "port-version": 0 + }, "vili": { "baseline": "1.0.0+20221123", "port-version": 0 @@ -8037,16 +8045,16 @@ "port-version": 1 }, "vtk": { - "baseline": "9.0.3-pv5.9.1", - "port-version": 12 + "baseline": "9.2.0-pv5.11.0", + "port-version": 0 }, "vtk-dicom": { "baseline": "0.8.14", - "port-version": 0 + "port-version": 1 }, "vtk-m": { - "baseline": "1.6.0", - "port-version": 2 + "baseline": "1.9.0", + "port-version": 0 }, "vulkan": { "baseline": "1.1.82.1", diff --git a/versions/c-/cgns.json b/versions/c-/cgns.json index ac4f609907eca0..a7321919c10d59 100644 --- a/versions/c-/cgns.json +++ b/versions/c-/cgns.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "3a5778901a44a39370c08cf42ad0de44223090c0", + "version-semver": "4.3.0", + "port-version": 3 + }, { "git-tree": "42310ddda48bebfc2b1518c3cf99f4f8b21432e4", "version-semver": "4.3.0", diff --git a/versions/h-/hdf5.json b/versions/h-/hdf5.json index ec400e09649dd4..28f31a8b9b08d5 100644 --- a/versions/h-/hdf5.json +++ b/versions/h-/hdf5.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "71726aefa4830ee87043862a8541853861cd8333", + "version": "1.12.2", + "port-version": 5 + }, { "git-tree": "815c3b39b38a2cf57e33d010b6a8f9c84a178676", "version": "1.12.2", diff --git a/versions/m-/matio.json b/versions/m-/matio.json index 472498c7912d5b..ff319377583bd4 100644 --- a/versions/m-/matio.json +++ b/versions/m-/matio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "ee4fd8ab9268b332bd49e3b506033487a39afe26", + "version": "1.5.23", + "port-version": 1 + }, { "git-tree": "e018403a4c2e749f8983b6a64f60dac577342853", "version-semver": "1.5.23", diff --git a/versions/o-/opencv4.json b/versions/o-/opencv4.json index e3b36b6ee56441..9a0ab627e02f0c 100644 --- a/versions/o-/opencv4.json +++ b/versions/o-/opencv4.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "677670190cbd9471967b6670cfeffa3507fb158c", + "version": "4.7.0", + "port-version": 1 + }, { "git-tree": "59d3985dfc44ac8279bb474e81f314aa29faf9b6", "version": "4.7.0", diff --git a/versions/o-/openimageio.json b/versions/o-/openimageio.json index 3a566cb174d157..76a8f87a97501e 100644 --- a/versions/o-/openimageio.json +++ b/versions/o-/openimageio.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f9959dd6e10f7f11261c50108d4399f29d21883a", + "version": "2.4.5.0", + "port-version": 2 + }, { "git-tree": "ecd81b1df58bf0fb628ad86bfde7522e36a602e4", "version": "2.4.5.0", diff --git a/versions/p-/paraview.json b/versions/p-/paraview.json index 91d43f8c5be465..723005d6af45c7 100644 --- a/versions/p-/paraview.json +++ b/versions/p-/paraview.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "2d9618d727ccb99ba7067dc82a21fca3afe402d3", + "version": "5.11.0", + "port-version": 0 + }, { "git-tree": "8f5d22c6754f293f54a360472f78e760f06aae80", "version": "5.9.1", diff --git a/versions/s-/seacas.json b/versions/s-/seacas.json new file mode 100644 index 00000000000000..ee7cb21694ab54 --- /dev/null +++ b/versions/s-/seacas.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "5462d578f0230f960e645ea8e053c0717bc7c376", + "version-date": "2022-11-22", + "port-version": 0 + } + ] +} diff --git a/versions/v-/verdict.json b/versions/v-/verdict.json new file mode 100644 index 00000000000000..54a2c7d52986eb --- /dev/null +++ b/versions/v-/verdict.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "dc33a2fb229de296ae77638542f91d5bb1d63e69", + "version": "1.4.0", + "port-version": 0 + } + ] +} diff --git a/versions/v-/vtk-dicom.json b/versions/v-/vtk-dicom.json index c108c59697cdaf..0dcb284a57b72d 100644 --- a/versions/v-/vtk-dicom.json +++ b/versions/v-/vtk-dicom.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "96d043efb89eb2522af31366de52c340ca5c5193", + "version": "0.8.14", + "port-version": 1 + }, { "git-tree": "db43c05e6c9d53f9e16178ddde2964385ba8e3c5", "version": "0.8.14", diff --git a/versions/v-/vtk-m.json b/versions/v-/vtk-m.json index d96689fa0b82c8..8a662a2d1c5882 100644 --- a/versions/v-/vtk-m.json +++ b/versions/v-/vtk-m.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "48465076980827e86cf3c53f4834a74812223d2e", + "version": "1.9.0", + "port-version": 0 + }, { "git-tree": "bfd540dbdb5d0684ea4e5363e3b32cfceadcb542", "version-semver": "1.6.0", diff --git a/versions/v-/vtk.json b/versions/v-/vtk.json index 5423109ba52ae5..523a7379a84d8c 100644 --- a/versions/v-/vtk.json +++ b/versions/v-/vtk.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "b5abc532a3af0562e38d66493eb784ee92c44337", + "version-semver": "9.2.0-pv5.11.0", + "port-version": 0 + }, { "git-tree": "64cd3c51764272ed1c8acc2d5fa37106d9f76b66", "version-semver": "9.0.3-pv5.9.1",