mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 03:19:01 +08:00
8c7e8df015
* [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 Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
25 lines
1008 B
Diff
25 lines
1008 B
Diff
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
|