move back to master branch for SMESH/NETGENPLUGIN

[tools/sat_salome.git] / applications / SALOME-9.8.0.pyconf

diff --git a/applications/SALOME-9.8.0.pyconf b/applications/SALOME-9.8.0.pyconf
index d0f61ba12380a0384c17694dd1aeb97e6b5b61f5..f42b0c3ef2e49d7596f1862f1cd9645a727fa46c 100644 (file)
--- a/applications/SALOME-9.8.0.pyconf
+++ b/applications/SALOME-9.8.0.pyconf
@@ -15,10 +15,10 @@ APPLICATION :
     {
         build : 
         {
-           CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
-           RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
-           SALOME_USE_64BIT_IDS : '1'
-           VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
+            CONFIGURATION_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "CONFIGURATION"
+            RESTRICTED_ROOT_DIR : $workdir + $VARS.sep + "SOURCES" + $VARS.sep + "RESTRICTED"
+            SALOME_USE_64BIT_IDS : '1'
+            VTK_SMP_IMPLEMENTATION_TYPE : OpenMP # OpenMP # choose among: sequential / OpenMP / TBB switches
         }
         launch : {PYTHONIOENCODING:"UTF_8", SALOME_MODULES_ORDER:"SHAPER:SHAPERSTUDY:GEOM:SMESH"}
         SALOME_trace : "local" # local/file:.../with_logger
@@ -146,7 +146,7 @@ APPLICATION :
         'JOBMANAGER'
         'YACS'
         'YACSGEN'
-        'SOLVERLAB' : {tag : 'a9937a9'}
+        'SOLVERLAB'
         'DOCUMENTATION'
         'SAMPLES'
         'COMPONENT'
@@ -189,18 +189,18 @@ APPLICATION :
 }
 __overwrite__ :
 [
-  {
-   __condition__ : "VARS.dist in ['FD32']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.scipy' : '1.5.2'
-  }
-  {
-   __condition__ : "VARS.dist in ['FD30']"
-   # https://github.com/scipy/scipy/issues/11611
-   'APPLICATION.products.gcc' : '9.3.0'
-  }
-  {
-   __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
-   'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
-  }
+    {
+        __condition__ : "VARS.dist in ['FD32']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.scipy' : '1.5.2'
+    }
+    {
+        __condition__ : "VARS.dist in ['FD30']"
+        # https://github.com/scipy/scipy/issues/11611
+        'APPLICATION.products.gcc' : '9.3.0'
+    }
+    {
+        __condition__ : "VARS.dist not in ['DB08','DB09', 'FD30']"
+        'APPLICATION.rm_products' : ['gcc', 'gmp', 'mpc', 'mpfr']
+    }
 ]