From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 19 Feb 2021 13:32:02 +0000 (+0100)
Subject: MEDCOUPLING 8.5.0 fix
X-Git-Tag: V9_7_0~109
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fe0e782bf5c05ccd7663bb811fd9a50ff2a61650;p=tools%2Fsat_salome.git

MEDCOUPLING 8.5.0 fix
---

diff --git a/applications/MEDCOUPLING-8.5.0.pyconf b/applications/MEDCOUPLING-8.5.0.pyconf
index a7b7e2a..44c2a45 100644
--- a/applications/MEDCOUPLING-8.5.0.pyconf
+++ b/applications/MEDCOUPLING-8.5.0.pyconf
@@ -30,44 +30,28 @@ APPLICATION :
         metis : '5.1.0'
         numpy : '1.12.1'
         Pygments : '2.0.2'
-        Python : '2.7.10'
+        Python : '2.7.16'
         pytz : '2015.4'
         scipy : '0.18.1'
         scotch : '6.0.4'
         setuptools : '38.4.0'
         six : '1.10.0'
         Sphinx : '1.2.3'
-
-        # TA 06-04-2018 Add sphinx-intl prerequisite
         sphinxintl: '0.9.10'
         swig : '2.0.12'
-        
-        
-        
-#
-        # SALOME MODULES :
-        'CONFIGURATION': {dev: 'yes'}
-        'MEDCOUPLING': {dev: 'yes'}
 
+        # SALOME MODULES :
+        'CONFIGURATION'
+        'MEDCOUPLING'
     }
     test_base : 
     {
         name : "SALOME"
         tag : "SalomeV8"
     }
+    properties :
+    {
+        repo_dev : "yes"
+        single_install_dir : "no"
+    }
 }
-
-__overwrite__ :
-[
-   {
-       # OP 09/04/2018 add sphinx-intl, six prerequisites
-    'PRODUCTS.MEDCOUPLING.default.depend' : 
-     [
-         "Babel", "boost", "click", "cmake", "cppunit", "Cython", "docutils",
-         "doxygen", "graphviz", "hdf5", "Jinja2", "lapack", "libxml2",
-         "markupsafe", "medfile", "metis", "numpy", "Pygments", "Python", "pytz",
-         "scipy", "scotch", "setuptools", "six", "Sphinx", "sphinxintl",
-         "swig", "CONFIGURATION"
-     ]
-   }
-]
diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 26d95d2..e498396 100644
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -136,6 +136,39 @@ version_V9_3_0_win :
     cmake_options : ' -DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF '
 }
 
+version_8_5_0 :
+{
+    depend : ["Babel",
+	      "boost",
+	      "click",
+	      "cmake",
+	      "cppunit",
+	      "Cython",
+	      "docutils",
+              "doxygen",
+	      "graphviz",
+	      "hdf5",
+	      "Jinja2",
+	      "lapack",
+	      "libxml2",
+              "markupsafe",
+	      "medfile",
+	      "metis",
+	      "numpy",
+	      "Pygments",
+	      "Python",
+	      "pytz",
+              "scipy",
+	      "scotch",
+	      "setuptools",
+	      "six",
+	      "Sphinx",
+	      "sphinxintl",
+              "swig",
+	      "CONFIGURATION"
+	     ]
+}
+
 version_7_8_2_to_8_4_0 :
 {
     cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=ON -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=ON -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=OFF -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=OFF"