bos #28799: PMML as external dependency

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 0c8070c7c0283b9cce63ef74429ea33fab97a691..3595950c801cd4a2e03e9b760fee9edc397e4bd8 100644 (file)
--- a/applications/SALOME-master-MPI.pyconf
+++ b/applications/SALOME-master-MPI.pyconf
@@ -172,6 +172,7 @@ APPLICATION :
         'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
+        'pmml'
         'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 72ad724e48d0f351cf479f3982b1ca3b88107b9f..6474bba25cb08db3d190811e26fcc67ea205739e 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -180,6 +180,7 @@ APPLICATION :
         'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
+        'pmml'
         'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }

diff --git a/applications/SALOME-master-windows.pyconf b/applications/SALOME-master-windows.pyconf
index a839cd6b932e86c295408fc62afb90bc52b7e756..d19621b957dbe30647ff0a560882e82389b921cb 100644 (file)
--- a/applications/SALOME-master-windows.pyconf
+++ b/applications/SALOME-master-windows.pyconf
@@ -166,6 +166,7 @@ APPLICATION :
         'EFICAS_TOOLS'
         'ADAO'
         'PARAVISADDONS'
+        'pmml'
         'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 6caf164ea35757589f4e5d6b04edc3718f134292..76d7d524ec1b8abf556438d6321184b9ab290619 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -175,6 +175,7 @@ APPLICATION :
         'ADAO_INTERFACE'
         'PARAVISADDONS'
         'YDEFX'
+        'pmml'
         'TESTBASE': {tag: 'master'}
         'CEATESTBASE' : {tag: 'SalomeV9'}
     }

diff --git a/products/YACS.pyconf b/products/YACS.pyconf
index e94eb08e6022c65b12c28a73df2dae06e5fdfe6b..0ba5a94e73004b08311e4b46af19d91e5a5033d9 100644 (file)
--- a/products/YACS.pyconf
+++ b/products/YACS.pyconf
@@ -2,6 +2,7 @@ default :
 {
     name : "YACS"
     build_source : "cmake"
+    cmake_options : " -DSALOME_YACS_USE_EMBEDDED_PMML=OFF"
     get_source : "git"
     git_info:
     {

diff --git a/products/pmml.pyconf b/products/pmml.pyconf
index f3bd04fe4f4a1e28f6f1c8cf208ff876bf845387..8f9e1719821d786e9258c0462c8dbc77c26d2ba5 100644 (file)
--- a/products/pmml.pyconf
+++ b/products/pmml.pyconf
@@ -18,4 +18,18 @@ default :
     source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
     build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
     install_dir : 'base'
+    properties :
+    {
+      incremental : "yes"
+      single_install_dir : "no"
+    }
+}
+
+default_win :
+{
+    properties :
+    {
+      incremental : "yes"
+      single_install_dir : "yes"
+    }
 }