Merge branch 'spns/20216' of https://codev-tuleap.cea.fr/plugins/git/salome/sat_salom...

Conflicts:
	products/CONFIGURATION.pyconf
	products/cmake.pyconf
	products/petsc.pyconf

diff --cc products/CONFIGURATION.pyconf
index 0f7455aa4084dcac1efcdae6df1d3460a12c273b,d64b98df43fbb314ed612fbe8d3fc709fa5c4fb4..69c917e1eb287697134a058abb99d1fa5af6ba2b
--- 1/products/CONFIGURATION.pyconf
--- 2/products/CONFIGURATION.pyconf
+++ b/products/CONFIGURATION.pyconf
@@@ -19,6 -19,5 +19,6 @@@ default 
          configure_dependency : "yes"  # the source of this module is required for the configuration of salome
          is_SALOME_module : "yes"
      }
-     
 -    patches : ["configuration-avoid-cmakeWarningOnFindGmsh.patch"]
++
 +    patches : []
  }

diff --cc products/cmake.pyconf
index 1ceef650b96ebf4360cc9c30cc98e10a76a833a6,6161d094d59d425d5b76c3299f9cc12bc53053b4..25952e40f556c8bc4500e6a93ed79d738e83d246
--- 1/products/cmake.pyconf
--- 2/products/cmake.pyconf
+++ b/products/cmake.pyconf
@@@ -5,7 -5,7 +5,7 @@@ default 
      compil_script : $name  + $VARS.scriptExtension
      get_source : "archive"
      patches: []
--    system_info : 
++    system_info :
      {
          rpm : []
          rpm_dev : ["cmake"]