From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 2 Oct 2020 15:39:44 +0000 (+0200)
Subject: OpenMP compliance - force to OPENMP 200805 on CentOS 7
X-Git-Tag: V9_6_0~22
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8c900386d42629f68d74f1a131c970eb210d673e;p=tools%2Fsat_salome.git

OpenMP compliance - force to OPENMP 200805 on CentOS 7
---

diff --git a/applications/SALOME-master-int64.pyconf b/applications/SALOME-master-int64.pyconf
index fba15e6..f09d073 100644
--- a/applications/SALOME-master-int64.pyconf
+++ b/applications/SALOME-master-int64.pyconf
@@ -216,6 +216,18 @@ __overwrite__ :
                                                 ]
   }
 
+  {
+    __condition__ : "VARS.dist in ['CO7']"
+    'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0003-ParaViewClient.patch',
+                                                 'paraview.0004-ParaView_hdf5.patch',
+                                                 'paraview.0005-ParaView_find_cgns.patch',
+                                                 'paraview.0006-ParaView_find_libxml2.patch',
+                                                 'paraview.0007-ParaView_find_freetype.patch',
+                                                 'paraview.0009-ParaView_volume_mapper.patch',
+                                                 'paraview.0011-vtkSMPSelection.patch',
+                                                 'pv_coincident.patch'
+                                                ]
+  }
   {
     __condition__ : "VARS.dist in ['CO8']"
     'PRODUCTS.ParaView.version_5_8_0.patches' : ['paraview.0010-ParaViewClient.patch',
diff --git a/products/patches/paraview.0011-vtkSMPSelection.patch b/products/patches/paraview.0011-vtkSMPSelection.patch
new file mode 100644
index 0000000..ad35fc5
--- /dev/null
+++ b/products/patches/paraview.0011-vtkSMPSelection.patch
@@ -0,0 +1,11 @@
+--- ParaView-orig/VTK/Common/Core/vtkSMPSelection.cmake	2020-03-23 22:17:27.000000000 +0100
++++ ParaView/VTK/Common/Core/vtkSMPSelection.cmake	2020-10-02 14:17:04.211733392 +0200
+@@ -44,7 +44,7 @@ elseif (VTK_SMP_IMPLEMENTATION_TYPE STRE
+     vtkSMPThreadLocalImpl.h
+     vtkSMPToolsInternal.h)
+ 
+-  if (OpenMP_CXX_SPEC_DATE AND NOT "${OpenMP_CXX_SPEC_DATE}" LESS "201107")
++  if (OpenMP_CXX_SPEC_DATE AND NOT "${OpenMP_CXX_SPEC_DATE}" LESS "200805")
+     set(vtk_smp_use_default_atomics OFF)
+     list(APPEND vtk_smp_sources
+       "${vtk_smp_implementation_dir}/vtkAtomic.cxx")