Merge topic 'windows-build-fixes'

cd8b41f47 Fix type conversion warnings
560861597 Disable header testing in PPP2 mesh_dem_meshtypes

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1428

examples/contour_tree_augmented/ContourTreeApp.cxx

@@ -246,9 +246,8 @@ int main(int argc, char* argv[])
 
   // Compute the number of vertices, i.e., xdim * ydim * zdim
   auto nDims = dims.size();
-  std::vector<vtkm::Float32>::size_type nVertices =
+  std::vector<vtkm::Float32>::size_type nVertices = std::vector<vtkm::Float32>::size_type(
-    std::vector<vtkm::Float32>::size_type(std::accumulate(
+    std::accumulate(dims.begin(), dims.end(), vtkm::Id(1), std::multiplies<vtkm::Id>()));
-      dims.begin(), dims.end(), 1, std::multiplies<std::vector<vtkm::Float32>::size_type>()));
 
   // Print the mesh metadata
   std::cout << "Number of dimensions: " << nDims << std::endl;

vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_2D/CMakeLists.txt

@@ -66,6 +66,8 @@
 set(headers
   ExecutionObject_MeshStructure.h
   Types.h
+  # Testing on windows causes access issues with compiler database files for some reason
+  TESTABLE OFF
   )
 
 #-----------------------------------------------------------------------------

vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/freudenthal_3D/CMakeLists.txt

@@ -66,6 +66,8 @@
 set(headers
   ExecutionObject_MeshStructure.h
   Types.h
+  # Testing on windows causes access issues with compiler database files for some reason
+  TESTABLE OFF
   )
 
 #-----------------------------------------------------------------------------

vtkm/worklet/contourtree_augmented/mesh_dem_meshtypes/marchingcubes_3D/CMakeLists.txt

@@ -66,6 +66,8 @@
 set(headers
   ExecutionObject_MeshStructure.h
   Types.h
+  # Testing on windows causes access issues with compiler database files for some reason
+  TESTABLE OFF
   )
 
 #-----------------------------------------------------------------------------