spns #20273 REX compilation 9.6.0 rc1 sur Debian 10

[tools/sat_salome.git] / products / MEDCOUPLING.pyconf

diff --git a/products/MEDCOUPLING.pyconf b/products/MEDCOUPLING.pyconf
index 23649704f39657f174c4cb8c7376d1c92a2317fa..e9bed61802cc0f5b7747c981cccaa91ca299ce5e 100644 (file)
--- a/products/MEDCOUPLING.pyconf
+++ b/products/MEDCOUPLING.pyconf
@@ -30,18 +30,18 @@ default :
               "CONFIGURATION"
               ]
     build_depend : ["cmake", "swig", "doxygen", "graphviz", "cppunit"]
+    opt_depend : []
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties:
     {
+        incremental : "yes"
         is_SALOME_module : "yes"
         has_unit_tests
         fhs : "yes"
-        incremental : "yes"
     }
 }
 
-
 default_win :
 {
     cmake_options : '  -DMEDCOUPLING_USE_64BIT_IDS=ON -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 '
@@ -65,6 +65,32 @@ default_win :
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
+default_MPI :
+{
+    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON"
+    depend : [
+              "boost",
+              "cppunit",
+              "Python",
+              "hdf5",
+              "medfile",
+              "scotch",
+              "ParMetis",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "setuptools",
+              "six",
+              "pytz",
+              "numpy",
+              "scipy",
+              "lapack",
+              "CONFIGURATION",
+              "openmpi"
+              ]
+}
+
 default_int64:
 { 
     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 -DMEDCOUPLING_USE_64BIT_IDS=ON"
@@ -99,33 +125,6 @@ version_7_8_2_to_8_4_0 :
               ]
 }
 
-# Default section for MPI version, for SALOME-8.5.0-MPI and later
-default_MPI :
-{
-    cmake_options : "-DMEDCOUPLING_ENABLE_PYTHON=ON -DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_ENABLE_RENUMBER=ON -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=ON -DMEDCOUPLING_PARTITIONER_PARMETIS=ON -DMEDCOUPLING_MICROMED=OFF -DMEDCOUPLING_USE_MPI=ON -DSALOME_USE_MPI=ON -DMEDCOUPLING_USE_64BIT_IDS=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    depend : [
-              "boost",
-              "Python",
-              "hdf5",
-              "medfile",
-              "scotch",
-              "docutils",
-              "libxml2",
-              "ParMetis",
-              "Sphinx",
-              "sphinxintl",
-              "setuptools",
-              "six",
-              "pytz",
-              "numpy",
-              "scipy",
-              "lapack",
-              "openmpi",
-              "cppunit",
-              "CONFIGURATION"
-              ]
-}
-
 version_V7_8_0 :
 {
     cmake_options : "-DMEDCOUPLING_ENABLE_PARTITIONER=OFF -DMEDCOUPLING_PARTITIONER_METIS=OFF -DMEDCOUPLING_PARTITIONER_SCOTCH=OFF"