From 8fafe9dadba80580bc822a589dc8cbdbf5644014 Mon Sep 17 00:00:00 2001 From: Quentin Cozette Date: Thu, 8 Apr 2021 11:01:33 +0200 Subject: [PATCH] Adapt ParaView VTKM patch (MPI) to new 5.9 version --- products/ParaView.pyconf | 4 ++-- products/patches/paraview-5.9-VTKM_MPI.patch | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 products/patches/paraview-5.9-VTKM_MPI.patch diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf index 93ec6a0..64e1525 100755 --- a/products/ParaView.pyconf +++ b/products/ParaView.pyconf @@ -123,7 +123,7 @@ version_5_9_0_MPI : 'paraview.0005-ParaView_find_cgns.patch', 'paraview.0006-ParaView_find_libxml2.patch', 'paraview.0007-ParaView_find_freetype.patch', - 'paraview.0012-VTKM_MPI.patch', + 'paraview-5.9-VTKM_MPI.patch', 'paraview-0012-LATA_64BITS_IDS.patch', 'ParaView-5.9.0-CATALYST_cmake.patch' ] @@ -138,7 +138,7 @@ version_5_9_0_MPI_int32 : 'paraview.0005-ParaView_find_cgns.patch', 'paraview.0006-ParaView_find_libxml2.patch', 'paraview.0007-ParaView_find_freetype.patch', - 'paraview.0012-VTKM_MPI.patch', + 'paraview-5.9-VTKM_MPI.patch', 'ParaView-5.9.0-CATALYST_cmake.patch' ] } diff --git a/products/patches/paraview-5.9-VTKM_MPI.patch b/products/patches/paraview-5.9-VTKM_MPI.patch new file mode 100644 index 0000000..e6d5f9d --- /dev/null +++ b/products/patches/paraview-5.9-VTKM_MPI.patch @@ -0,0 +1,10 @@ +--- ParaView_ref/./VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake 2020-07-20 14:51:20.129903776 +0200 ++++ ParaView_new/./VTK/ThirdParty/vtkm/vtkvtkm/vtk-m/CMake/VTKmDeviceAdapters.cmake 2020-07-20 14:57:01.681171900 +0200 +@@ -82,7 +82,7 @@ endif() + + if(VTKm_ENABLE_OPENMP AND NOT TARGET vtkm::openmp) +- find_package(OpenMP 4.0 REQUIRED COMPONENTS CXX QUIET) ++ find_package(OpenMP 3.1 REQUIRED COMPONENTS CXX QUIET) + + add_library(vtkm::openmp INTERFACE IMPORTED GLOBAL) + if(OpenMP_CXX_FLAGS) -- 2.39.2