merge from master

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

diff --git a/products/HEXABLOCK.pyconf b/products/HEXABLOCK.pyconf
index 7287c29392c38f2ed79250ff1c34dd6979608163..e305066596c7754ab6e6be54c099c88c0284ab6a 100644 (file)
--- a/products/HEXABLOCK.pyconf
+++ b/products/HEXABLOCK.pyconf
@@ -38,26 +38,17 @@ default :
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     properties:
     {
+        incremental : "yes"
         has_salome_gui : "yes"
         is_SALOME_module : "yes"
         has_unit_tests
     }
+    patches: []
 } 
 
 default_MPI :
 {
-    name : "HEXABLOCK"
-    build_source : "cmake"
-    cmake_options : "-DSALOME_USE_MPI=ON -DCMAKE_CXX_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpic++ DCMAKE_C_COMPILER:STRING=${MPI_ROOT_DIR}/bin/mpicc"
-    get_source : "git"
-    git_info:
-    {
-        repo : $PROJECTS.projects.salome.git_info.default_git_server + "modules/hexablock.git"
-        repo_dev : $PROJECTS.projects.salome.git_info.default_git_server_dev + "hexablock.git"
-    }
-    environ :
-    {
-    }
+    cmake_options : "-DSALOME_USE_MPI=ON"
     depend : [
              "KERNEL", 
              "GUI", 
@@ -78,15 +69,41 @@ default_MPI :
              "pytz",    
              "markupsafe",
              "openmpi"
-              ]
-    build_depend : ["cmake", "cppunit"]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    properties:
-    {
-        has_salome_gui : "yes"
-        is_SALOME_module : "yes"
-        has_unit_tests
-    }
+            ]
 } 
 
+version_V9_9_0_MPI :
+{
+    cmake_options : "-DSALOME_USE_MPI=ON"
+    depend : [
+             "KERNEL", 
+             "GUI", 
+             "GEOM",
+             "boost", 
+             "CAS", 
+             "Python", 
+             "omniORB", 
+             "qt", 
+             "ParaView", 
+             "docutils", 
+             "libxml2", 
+             "Sphinx", 
+             "Jinja2", 
+             "setuptools", 
+             "Pygments", 
+             "six", 
+             "pytz",    
+             "markupsafe",
+             "openmpi"
+            ]
+} 
+
+version_V9_9_0_UB22_04 :
+{
+    patches: ['SPNS-29880-HEXABLOCK_V9_9_0.patch']
+}
+
+version_V9_9_0_FD36 :
+{
+    patches: ['SPNS-29880-HEXABLOCK_V9_9_0.patch']
+}