mirror of https://github.com/microsoft/vcpkg.git
[vtk] add feature (#43328)
This commit is contained in:
parent
a38c73151e
commit
fc5118086f
|
|
@ -0,0 +1,15 @@
|
|||
diff --git a/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx b/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx
|
||||
index e5792ee..e81d5ed 100644
|
||||
--- a/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx
|
||||
+++ b/Common/Core/SMP/TBB/vtkSMPToolsImpl.txx
|
||||
@@ -190,6 +190,10 @@ int vtkSMPToolsImpl<BackendType::TBB>::GetEstimatedNumberOfThreads();
|
||||
template <>
|
||||
bool vtkSMPToolsImpl<BackendType::TBB>::GetSingleThread();
|
||||
|
||||
+//--------------------------------------------------------------------------------
|
||||
+template <>
|
||||
+VTKCOMMONCORE_EXPORT vtkSMPToolsImpl<BackendType::TBB>::vtkSMPToolsImpl();
|
||||
+
|
||||
VTK_ABI_NAMESPACE_END
|
||||
} // namespace smp
|
||||
} // namespace detail
|
||||
|
|
@ -39,6 +39,7 @@ vcpkg_from_github(
|
|||
opencascade-7.8.0.patch
|
||||
no-libharu-for-ioexport.patch
|
||||
no-libproj-for-netcdf.patch
|
||||
fix-tbbsmptool.patch #https://gitlab.kitware.com/vtk/vtk/-/merge_requests/11530
|
||||
)
|
||||
|
||||
# =============================================================================
|
||||
|
|
@ -241,11 +242,25 @@ else()
|
|||
)
|
||||
endif()
|
||||
|
||||
if("tbb" IN_LIST FEATURES)
|
||||
list(APPEND ADDITIONAL_OPTIONS
|
||||
-DVTK_SMP_IMPLEMENTATION_TYPE=TBB
|
||||
)
|
||||
endif()
|
||||
|
||||
if("openmp" IN_LIST FEATURES)
|
||||
list(APPEND ADDITIONAL_OPTIONS
|
||||
-DVTK_SMP_IMPLEMENTATION_TYPE=OpenMP
|
||||
)
|
||||
endif()
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
FEATURES
|
||||
"cuda" VTK_USE_CUDA
|
||||
"mpi" VTK_USE_MPI
|
||||
"all" VTK_BUILD_ALL_MODULES
|
||||
"tbb" VTK_SMP_ENABLE_TBB
|
||||
"openmp" VTK_SMP_ENABLE_OPENMP
|
||||
)
|
||||
|
||||
# =============================================================================
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "vtk",
|
||||
"version-semver": "9.3.0-pv5.12.1",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "Software system for 3D computer graphics, image processing, and visualization",
|
||||
"homepage": "https://github.com/Kitware/VTK",
|
||||
"license": null,
|
||||
|
|
@ -218,6 +218,9 @@
|
|||
}
|
||||
]
|
||||
},
|
||||
"openmp": {
|
||||
"description": "Use openmp multithreading parallel implementation"
|
||||
},
|
||||
"openvr": {
|
||||
"description": "OpenVR functionality for VTK",
|
||||
"dependencies": [
|
||||
|
|
@ -317,6 +320,12 @@
|
|||
"sqlite3"
|
||||
]
|
||||
},
|
||||
"tbb": {
|
||||
"description": "Use TBB multithreading parallel implementation",
|
||||
"dependencies": [
|
||||
"tbb"
|
||||
]
|
||||
},
|
||||
"utf8": {
|
||||
"description": "Enables vtk reader/writer with utf-8 path support",
|
||||
"dependencies": [
|
||||
|
|
|
|||
|
|
@ -9546,7 +9546,7 @@
|
|||
},
|
||||
"vtk": {
|
||||
"baseline": "9.3.0-pv5.12.1",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"vtk-dicom": {
|
||||
"baseline": "0.8.16",
|
||||
|
|
|
|||
|
|
@ -1,5 +1,10 @@
|
|||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "99106a39e2e8608b7a33f937bdaa62be93fdbbca",
|
||||
"version-semver": "9.3.0-pv5.12.1",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "5727b06657959909b4ffe7608c3d849acb38f286",
|
||||
"version-semver": "9.3.0-pv5.12.1",
|
||||
|
|
|
|||
Loading…
Reference in New Issue