From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 28 May 2021 13:58:53 +0000 (+0200)
Subject: SALOME 9.7.0 MPI - fix souci compilation si devtoolset
X-Git-Tag: V9_7_0~4
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=583e730b1f0c09ba67bc8c0465d00c59fa1f1cc9;p=tools%2Fsat_salome.git

SALOME 9.7.0 MPI - fix souci compilation si devtoolset
---

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index 10e3798..cf8dc2b 100755
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -137,7 +137,8 @@ version_5_9_0_MPI :
                'paraview.0010-ParaView_CATALYST_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
                'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch'
+               'paraview.0015-Paraview_VTKM_ioss.patch',
+               'paraview.0017-VTK-openMPI-if-devtoolset.patch'
               ]
 }
 
@@ -154,7 +155,8 @@ version_5_9_0_MPI_int32 :
                'paraview.0010-ParaView_CATALYST_cmake.patch',
                'paraview.0008-ParaView_coincident_rendering.patch',
                'paraview.0011-ParaView_protobuf_crash.patch',
-               'paraview.0015-Paraview_VTKM_ioss.patch'
+               'paraview.0015-Paraview_VTKM_ioss.patch',
+               'paraview.0017-VTK-openMPI-if-devtoolset.patch'
               ]
 }
 
diff --git a/products/patches/paraview.0017-VTK-openMPI-if-devtoolset.patch b/products/patches/paraview.0017-VTK-openMPI-if-devtoolset.patch
new file mode 100644
index 0000000..e19bffb
--- /dev/null
+++ b/products/patches/paraview.0017-VTK-openMPI-if-devtoolset.patch
@@ -0,0 +1,29 @@
+diff -Naur ParaView_ref/VTK/CMake/vtkModule.cmake  ParaView_new/VTK/CMake/vtkModule.cmake
+--- ParaView_ref/VTK/CMake/vtkModule.cmake	2021-05-28 15:30:35.258745811 +0200
++++ ParaView_new/VTK/CMake/vtkModule.cmake	2021-05-28 15:29:03.348649076 +0200
+@@ -4544,7 +4544,13 @@
+       if (_vtk_export_exact)
+         set(_vtk_export_exact_arg EXACT)
+       endif ()
++     
++      IF(_vtk_export_package MATCHES "MPI")
++      file(APPEND "${_vtk_export_output_file}"
++"  find_package(${_vtk_export_package})
++\n")
+ 
++      ELSE(_vtk_export_package MATCHES "MPI")
+       file(APPEND "${_vtk_export_output_file}"
+ "  find_package(${_vtk_export_package}
+     ${_vtk_export_version}
+@@ -4554,6 +4560,11 @@
+     \${_vtk_module_find_package_required}
+     COMPONENTS          ${_vtk_export_components}
+     OPTIONAL_COMPONENTS ${_vtk_export_optional_components})
++\n")
++
++ENDIF(_vtk_export_package MATCHES "MPI")
++      file(APPEND "${_vtk_export_output_file}"
++"
+   if (NOT ${_vtk_export_package}_FOUND AND _vtk_module_find_package_fail_if_not_found)
+     if (NOT \${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
+       message(STATUS