add catalyst

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index 8452987e6e5de69b1d9f0f96022b152905894728..a76c28e8287ebc6a7fc693ba11d7837f10037426 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -38,6 +38,7 @@ APPLICATION :
         boost : 'native'
         #CAS : 'CR753-SALOME-PATCH'
         CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
+        catalyst: '2.0'
         C3PO: 'v2.0'
         certifi : 'native'
         cgns : '4.2.0'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 285c08b3a2ad066ee1c654ef084f9b329b0f4a66..53216fcf2b1b2b7ee7d2e60a4fb0ee68108abdff 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -38,6 +38,7 @@ APPLICATION :
         boost : '1.71.0'
         #CAS : 'CR753-SALOME-PATCH'
         CAS : {tag : 'cfcbf4e', section: 'version_CR753_SALOME_PATCH', base: 'no'}
+        catalyst: '2.0'
         C3PO: 'v2.0'
         certifi : '2018.8.24'
         cgns : '4.2.0'

diff --git a/products/ParaView.pyconf b/products/ParaView.pyconf
index b99217e98dfbde13a800cd28890701ffb56bd81d..e780ded115b8d0a542f71eb8fc981377018b1be3 100755 (executable)
--- a/products/ParaView.pyconf
+++ b/products/ParaView.pyconf
@@ -159,6 +159,7 @@ version_5_11_0_MPI :
     #            'paraview.0020.findMPI.patch',
     #            'paraview.0021-FindGDAL.patch'
     #           ]
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'gdal', 'netcdf', 'catalyst']
 }
 
 version_5_11_0_MPI_LATA_64BITS_IDS :

diff --git a/products/catalyst.pyconf b/products/catalyst.pyconf
new file mode 100644 (file)
index 0000000..bd3f584
--- /dev/null
+++ b/products/catalyst.pyconf
@@ -0,0 +1,29 @@
+    name : "catalyst"
+    build_source : "cmake"
+    get_source : "archive"
+    archive_info : {archive_name : "catalyst-2.0-431a8a1.tar.gz"}
+    environ :
+    {
+       env_script : $name + ".py"
+    }
+    depend : [
+              'Python',
+              'hdf5',
+              'qt',
+              'boost',
+              'libxml2',
+              'freetype',
+              'matplotlib',
+              'cgns',
+              'Pygments'
+              ]
+    opt_depend : ['openmpi', 'ospray','tbb', 'openturns', 'rkCommon', 'gdal', 'netcdf']
+    build_depend : ["cmake"]
+    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"
+    }
+}

diff --git a/products/compil_scripts/ParaView-5.11.0.sh b/products/compil_scripts/ParaView-5.11.0.sh
index 8cffe1c5936095185f53dd2ee97c803b72c76a71..6f57dc2c9c1d64e154d71acbe0899771a1194f53 100755 (executable)
--- a/products/compil_scripts/ParaView-5.11.0.sh
+++ b/products/compil_scripts/ParaView-5.11.0.sh
@@ -36,6 +36,7 @@ CMAKE_OPTIONS+=" -DPARAVIEW_AUTOLOAD_PLUGIN_CatalystScriptGeneratorPlugin=ON"
 CMAKE_OPTIONS+=" -DPARAVIEW_BUILD_CATALYST_ADAPTORS=ON"
 CMAKE_OPTIONS+=" -DUSE_CATALYST:BOOL=ON"
 CMAKE_OPTIONS+=" -DPARAVIEW_ENABLE_CATALYST=ON"
+CMAKE_OPTIONS+=" -Dcatalyst_DIR=${CATALYST_ROOT_DIR}/lib/cmake/catalyst-2.0"
 
 ### spns #20550 - Headless mode
 if [ -n "$PARAVIEW_HEADLESS_MODE" ]; then

diff --git a/products/env_scripts/catalyst.py b/products/env_scripts/catalyst.py
new file mode 100644 (file)
index 0000000..c374a8b
--- /dev/null
+++ b/products/env_scripts/catalyst.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+#-*- coding:utf-8 -*-
+
+import os.path
+import platform
+
+def set_env(env, prereq_dir, version):
+  env.set('CATALYST_ROOT_DIR', prereq_dir)
+  env.set('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib'))
+  env.set('LD_LIBRARY_PATH', os.path.join(prereq_dir, 'lib', 'catalyst'))
+  
+def set_nativ_env(env):
+  pass