X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=products%2FKERNEL.pyconf;h=8a57be89225a1776cb1b7c9ed5a29cda7578b770;hb=00f6c849e6d2d97d7608c131008afb4b5441bc60;hp=25daa5d1871bdabc7f98d1850a598f8245fe7b13;hpb=298f0f1f3babde4391646eecad9c63ec2f3f46c2;p=tools%2Fsat_salome.git

diff --git a/products/KERNEL.pyconf b/products/KERNEL.pyconf
index 25daa5d..8a57be8 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 -DSALOME_USE_64BIT_IDS=ON"
     get_source : "git"
     git_info:
     {
@@ -28,12 +29,12 @@ default :
               "setuptools",
               "Pygments",
               "pytz",
-              "LIBBATCH"
+              "LIBBATCH",
+              "psutil"
               ]
     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"
@@ -44,7 +45,7 @@ default :
 
 default_win :
 {
-    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DCMAKE_GENERATOR=\"Visual Studio 15 2017 Win64\" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"1.67.0\" \"1.67\" -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67 -DBOOST_LIBRARYDIR=%BOOST_ROOT_DIR:\=/%/lib "
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DCMAKE_GENERATOR=\"Visual Studio 15 2017 Win64\" -DSWIG_EXECUTABLE=%SWIG_ROOT_DIR:\=/%/bin/swig.exe -DCMAKE_CXX_COMPILER_ARCHITECTURE_ID=x64 -DBOOST_ROOT=%BOOST_ROOT_DIR:\=/% -DBOOST_DEBUG=ON -DBoost_ADDITIONAL_VERSIONS=\"1.67.0\" \"1.67\" -DBOOST_INCLUDEDIR=%BOOST_ROOT_DIR:\=/%/include/boost-1_67 -DBOOST_LIBRARYDIR=%BOOST_ROOT_DIR:\=/%/lib -DSALOME_USE_64BIT_IDS=ON "
     depend : ["Python",
               "boost",
               "numpy",
@@ -60,11 +61,61 @@ default_win :
               "setuptools",
               "Pygments",
               "pytz",
-              "LIBBATCH"
+              "LIBBATCH",
+              "graphviz",
+              "psutil"
               ]
     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 -DSALOME_USE_64BIT_IDS=ON "
+    depend : ["Python",
+              "boost",
+              "numpy",
+              "lapack",
+              "hdf5",
+              "omniORB",
+              "omniORBpy",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "pytz",
+              "cppunit",
+              "openmpi",
+              "LIBBATCH",
+              "psutil"
+              ]
+}
+
+version_V8_5_0_to_V9_6_0:
+{
+    cmake_options : "-DSALOME_USE_LIBBATCH=ON -DSWIG_EXECUTABLE=${SWIG_ROOT_DIR}/bin/swig -DSALOME_CMAKE_DEBUG=ON "
+    depend : ["Python",
+              "boost",
+              "cppunit",
+              "numpy",
+              "lapack",
+              "hdf5",
+              "omniORB",
+              "omniORBpy",
+              "docutils",
+              "libxml2",
+              "Sphinx",
+              "sphinxintl",
+              "Jinja2",
+              "setuptools",
+              "Pygments",
+              "pytz",
+              "LIBBATCH"
+              ]
+}
+
 version_7_8_0_to_8_4_0 :
 {
     depend : ["Python",
@@ -143,6 +194,7 @@ ALAMOS_SALOME_9_win :
               "omniORB",
               "omniORBpy",
               "docutils",
+              "graphviz",
               "libxml2",
               "Sphinx",
               "sphinxintl",
@@ -204,34 +256,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"