X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2FKERNEL.pyconf;h=ee760903ceff82479af08a1017acd901970c94f4;hb=c4790359d1e03869bf000dee313a496d1ec2ee5e;hp=98a6b78c8a0629ccbf133e02404146ea4a856923;hpb=20ca4650d2734b2476a3a08bc588f97f2646ccad;p=tools%2Fsat_salome.git

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 98a6b78..ee76090 100644
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -3,6 +3,7 @@ default :
 {
     name : "KERNEL"
     build_source : "cmake"
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON"
     get_source : "git"
     git_info:
     {
@@ -33,7 +34,6 @@ default :
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON"
     properties:
     {
         is_SALOME_module : "yes"
@@ -66,6 +66,30 @@ default_win :
     build_depend : ["cmake", "swig", "doxygen", "cppunit"]
 }
 
+default_MPI :
+{
+    cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig"
+    depend : ["Python",
+              "boost",
+              "numpy",
+              "lapack",
+              "hdf5",
+              "omniORB",
+              "omniORBpy",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "pytz",
+              "cppunit",
+              "openmpi",
+              "LIBBATCH"
+              ]
+}
+
 version_7_8_0_to_8_4_0 :
 {
     depend : ["Python",
@@ -206,34 +230,6 @@ ALAMOS :
     }
 }
 
-# Default section for MPI version, for SALOME-8.5.0-MPI and later 
-# (adding sphinxintl prerequisite to previous MPI section).
-
-default_MPI :
-{
-    cmake_options : "-DSALOME_USE_MPI=ON -DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ -DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    depend : ["Python",
-              "boost",
-              "numpy",
-              "lapack",
-              "hdf5",
-              "omniORB",
-              "omniORBpy",
-              "docutils",
-              "libxml2",
-              "Sphinx",
-              "sphinxintl",
-              "Jinja2",
-              "setuptools",
-              "Pygments",
-              "pytz",
-              "cppunit",
-              "openmpi",
-              "LIBBATCH"
-              ]
-    build_depend : ["cmake", "swig", "doxygen", "cppunit"]
-}
-
 version_V6_6_0 :
 {
     name : "KERNEL"