SSL mode integration : switch back SALOME modules on master branches - patch HOMARD...

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

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 9a496655a326fbfe32d3ce0e1b0681f6c168e489..ee760903ceff82479af08a1017acd901970c94f4 100644 (file)
--- a/products/KERNEL.pyconf
+++ b/products/KERNEL.pyconf
@@ -3,13 +3,13 @@ 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:
     {
         repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/kernel.git"
         repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "kernel.git"
     }
-    patches : ['kernel_launcher_job.patch']
     environ :
     {          
     }
@@ -34,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"
@@ -61,11 +60,36 @@ default_win :
               "setuptools",
               "Pygments",
               "pytz",
-              "LIBBATCH"
+              "LIBBATCH",
+              "graphviz"
               ]
     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",
@@ -144,6 +168,7 @@ ALAMOS_SALOME_9_win :
               "omniORB",
               "omniORBpy",
               "docutils",
+              "graphviz",
               "libxml2",
               "Sphinx",
               "sphinxintl",
@@ -205,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"