From: SALOME support <support-salome@cea.fr>
Date: Thu, 9 Sep 2021 08:14:01 +0000 (+0200)
Subject: Merge branch 'spns/20216' of https://codev-tuleap.cea.fr/plugins/git/salome/sat_salom... 
X-Git-Tag: V9_8_0~99^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=dc1a479a1df39203fe04f79391f018b112952009;p=tools%2Fsat_salome.git

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

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

dc1a479a1df39203fe04f79391f018b112952009
diff --cc products/CONFIGURATION.pyconf
index 0f7455a,d64b98d..69c917e
--- a/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 1ceef65,6161d09..25952e4
--- a/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"]