update StaticMeshPlugin

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index c379b260ee498429260201840d569b8f2f7f3ad1..689b82f2e04dc040fc4aeb03b3924c95c5519d68 100644 (file)
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -123,7 +123,7 @@ APPLICATION :
         sphinxcontrib_websupport : 'native'
         sphinxintl: 'native'
         sphinx_rtd_theme : 'native'
-        StaticMeshPlugin: '5.8.0'
+        StaticMeshPlugin: '5.11.0'
         statsmodels : 'native'
         swig : 'native'
         salome_system : 'native'

diff --git a/applications/SALOME-master.pyconf b/applications/SALOME-master.pyconf
index 2e16f1353327ee6881ee3846ab15cff4df630798..2ea0fafb0a60e5148a2e529b93ba292f9b792fba 100644 (file)
--- a/applications/SALOME-master.pyconf
+++ b/applications/SALOME-master.pyconf
@@ -127,7 +127,7 @@ APPLICATION :
         sphinxcontrib_websupport : '1.1.0'
         sphinx_rtd_theme : '0.4.3'
         sphinxintl: '0.9.10'
-        StaticMeshPlugin: '5.8.0'
+        StaticMeshPlugin: '5.11.0'
         statsmodels: '0.8.0'
         swig : '3.0.12'
         tbb : '2019_U8'

diff --git a/products/StaticMeshPlugin.pyconf b/products/StaticMeshPlugin.pyconf
index 6755be0eb3497688116058ffdf02d09dcb82ac4e..856c37bee3576e7e5592f493fba8fb66e1bdafe1 100644 (file)
--- a/products/StaticMeshPlugin.pyconf
+++ b/products/StaticMeshPlugin.pyconf
@@ -1,64 +1,72 @@
 #!/usr/bin/env python
 #-*- coding:utf-8 -*-
 
-  default :
+default :
+{
+  name : 'StaticMeshPlugin'
+  build_source : 'cmake'
+  cmake_options : ''
+  get_source : "archive"
+  patches: []
+  environ :
   {
-    name : 'StaticMeshPlugin'
-    build_source : 'cmake'
-    cmake_options : ''
-    get_source : "archive"
-    patches: []
-    environ :
-    {
-      StaticMeshPlugin : $install_dir
-      # SPN 24019 : do not add StaticMeshPlugin to PV_PLUGIN_PATH - uploaded on request only
-      #PV_PLUGIN_PATH_ : $install_dir + $VARS.sep + 'lib' + $VARS.sep + 'paraview'
-    }
-    depend :
-    [
-      'KERNEL'
-      'GUI'
-      'MEDCOUPLING'
-      'PARAVIS'
-      'FIELDS'
-      'GEOM'
-      'SMESH'
-      'Python'
-      'qt'
-      'boost'
-      'hdf5'
-      'medfile'
-      'ParaView'
-      'CAS'
-      'omniORB'
-      'docutils'
-      'libxml2'
-      'six'
-      'pytz'
-    ]
-    opt_depend : ['openmpi']
-    build_depend :
-    [
-      'cmake'
-      'swig'
-      'cppunit'
-    ]
-    source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
-    build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
-    properties :
-    {
-      incremental : 'yes'
-    }
+    StaticMeshPlugin : $install_dir
+    # SPN 24019 : do not add StaticMeshPlugin to PV_PLUGIN_PATH - uploaded on request only
+    #PV_PLUGIN_PATH_ : $install_dir + $VARS.sep + 'lib' + $VARS.sep + 'paraview'
   }
-  version_5_8_0:
+  depend :
+  [
+    'KERNEL'
+    'GUI'
+    'MEDCOUPLING'
+    'PARAVIS'
+    'FIELDS'
+    'GEOM'
+    'SMESH'
+    'Python'
+    'qt'
+    'boost'
+    'hdf5'
+    'medfile'
+    'ParaView'
+    'CAS'
+    'omniORB'
+    'docutils'
+    'libxml2'
+    'six'
+    'pytz'
+  ]
+  opt_depend : ['openmpi']
+  build_depend :
+  [
+    'cmake'
+    'swig'
+    'cppunit'
+  ]
+  source_dir : $APPLICATION.workdir + $VARS.sep + 'SOURCES' + $VARS.sep + $name
+  build_dir : $APPLICATION.workdir + $VARS.sep + 'BUILD' + $VARS.sep + $name
+  properties :
   {
-   patches: ['StaticMeshPlugin-5.8.0.patch']
+    incremental : 'yes'
   }
+}
+default_win :
+{
+  depend :
+  [
+    'PARAVIS'
+  ]
+}
 
-  default_win :
-  {
-    depend :
-    [
-      'PARAVIS'
-    ]
-  }
+version_5_11_0:
+{
+ archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"}
+ patches: ['StaticMeshPlugin-5.11.0.patch']
+}
+
+version_5_8_0:
+{
+ patches: ['StaticMeshPlugin-5.8.0.patch']
+}
+
+  

diff --git a/products/patches/StaticMeshPlugin-5.11.0.patch b/products/patches/StaticMeshPlugin-5.11.0.patch
new file mode 100644 (file)
index 0000000..833f61b
--- /dev/null
+++ b/products/patches/StaticMeshPlugin-5.11.0.patch
@@ -0,0 +1,14 @@
+diff --git a/plugin/CMakeLists.txt b/plugin/CMakeLists.txt
+index 04bff27..40e81c6 100644
+--- a/plugin/CMakeLists.txt
++++ b/plugin/CMakeLists.txt
+@@ -4,3 +4,9 @@ paraview_add_plugin(StaticMesh
+   MODULE_FILES "${CMAKE_CURRENT_SOURCE_DIR}/StaticMeshModule/vtk.module"
+   SERVER_MANAGER_XML sources.xml readers.xml filters.xml
+ )
++
++install(TARGETS StaticMesh
++  RUNTIME DESTINATION lib/paraview
++  LIBRARY DESTINATION lib/paraview
++  ARCHIVE DESTINATION lib/paraview
++)