From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 1 Apr 2022 14:41:51 +0000 (+0200)
Subject: bos #28799: PMML as external dependency
X-Git-Tag: V9_9_0~107
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=592998fc88bff0d22c783a188b4f721782c3385c;p=tools%2Fsat_salome.git

bos #28799: PMML as external dependency
---

diff --git a/applications/SALOME-master-MPI.pyconf b/applications/SALOME-master-MPI.pyconf
index 0c8070c..3595950 100644
--- 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 72ad724..6474bba 100644
--- 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 a839cd6..d19621b 100644
--- 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 6caf164..76d7d52 100644
--- 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 e94eb08..0ba5a94 100644
--- 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 f3bd04f..8f9e171 100644
--- 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"
+    }
 }