mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-01 01:41:48 +08:00
9e36a44338
* [cgns] update to 4.2.0 * [vtk-m] update to 1.6.0 * [vtk] Update to 9.0.1-pv5.9.1 - VTK update to match release version of ParaView * [ParaView] Update to 5.9.1 * version stuff * fix automatic svg linkage in static builds * update qt5-svg * revisit vtk - fix build with vtk-m 1.6 - remove unused patches - remove comments * bump version * remove two commented lines * version stuff * remove old PR version * commit stuff * commit stuff * update notes * wip commit * update paraview * fix hdf5 patch * fix patch * fix patch * fix portfile * add mpi feature * format manifest * use relativ path * trace * retry * move qml files again * try with host triplet * - use VCPKG_CRT_LINKAGE - use METIS not metis * fix casing Zlib * hopefully more fixes on other platforms. * fix patch * fix missing ws * fix typos * scale down to warning * revert jsoncpp change fix zoltan on osx? * move trace option to failing port * move trace option to failing port * Revert "trilinos vcpkg.json changes" * verdict fix osx build ? * fix patch * fix internal find_package call * also apply correct case for metis * disable METIS on osx * vtk-m don't support arm. * force more features in Ci * fix missing , * more fixes * more vtk python try and error. * - paraview python setup same as vtk - remove openvr from platforms not supporting it - trace openimageio * fix case and remove fmt for openimageio. * trying to fix stuff * set hash to 0 * [skip actions] add missing module * WebCore module moved to paraview&python * fixes * remove patch in vtk-dicom * add var to maybe unused * use correct 5.11 ref instead of the one in release * Patch cleanup round 1 * remove empty patch parts * fix vtkm configs * reintegrate jsoncpp.patch * fix patch * add single seacas/kokkos/zoltan ports * throw out trilinos, zoltan, kokkos replace trilinos with seacas make seacas work for dynamic windows * fix mpi feature * fix dependency * retry dep fix * rename target * remove double line * fix target * fix patch * retry * remove cgns config * fix cgns * no seacas trace * lowercase hdf5 target * fix case of metis * disable Fortran * add iotr patch * add additional config folder * handel case sensitive Seacas again * get trace again and force jsoncpp * update cmake to 3.25.0 * bump port-version * add patch from vtk upstream * cleanup, format-manifest * fix port version * v db * opencv4 always inject deps. * fix test port to not require stuff which is not supported on x86 * Fix HDF5 lookup in opencv4 * only delete bin folder in static builds * add license field * v db * add missing " * v db * trace again * fix rtabmap python dep * fix openimageio by deleting the find module * v db * cr cleanup * v db * opencv4 v db due to merge with master. Had to bump port version * v db * v db * v db * CR comments * v db for cr comments * trace theia output * revert theia trace * v db * try without patch * revert rtabmap changes * v db after merge * v db for all
86 lines
4.1 KiB
Diff
86 lines
4.1 KiB
Diff
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 <class T> inline RefHolder<T> ByRef(T &t) { return RefHolder<T>(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 <Ioss_Map.h> // for Map
|
|
#include <Ioss_State.h> // for State
|
|
#include <exodus/Ioex_BaseDatabaseIO.h> // for DatabaseIO
|
|
+#include <exodus/Ioex_DecompositionData.h>
|
|
#include <functional> // for less
|
|
#include <map> // for map, map<>::value_compare
|
|
#include <memory>
|