From: Nabil Ghodbane <nabil.ghodbane@cea.fr>
Date: Fri, 30 Sep 2022 09:08:40 +0000 (+0200)
Subject: StaticMeshPlugin compilation issue on DB11
X-Git-Tag: V9_11_0~284
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c14fa77ea524dac1650aa5b82d1702796f9dee55;p=tools%2Fsat_salome.git

StaticMeshPlugin compilation issue on DB11
---

diff --git a/applications/SALOME-master-native.pyconf b/applications/SALOME-master-native.pyconf
index ddcbf8e..992c85c 100644
--- a/applications/SALOME-master-native.pyconf
+++ b/applications/SALOME-master-native.pyconf
@@ -249,7 +249,8 @@ __overwrite__ :
         __condition__ : "VARS.dist in ['DB11']"
         'APPLICATION.products.opencv' : '3.2.0'
         'APPLICATION.products.cminpack': 'native'
-        'APPLICATION.products.PyFMI'    : {tag:'2.6',    base: 'no',  section: 'version_2_6_no_pip'                 }
+        'APPLICATION.products.PyFMI'            : {tag:'2.6',    base: 'no',  section: 'version_2_6_no_pip' }
+        'APPLICATION.products.StaticMeshPlugin' : {tag:'5.11.0', base: 'no',  section: 'version_5_11_0_DB11'}
     }
     {
         # CentOS 8 repositories don't include sphinxintl package which must be installed through pip.
diff --git a/products/StaticMeshPlugin.pyconf b/products/StaticMeshPlugin.pyconf
index 856c37b..d8d6d27 100644
--- a/products/StaticMeshPlugin.pyconf
+++ b/products/StaticMeshPlugin.pyconf
@@ -61,7 +61,13 @@ default_win :
 version_5_11_0:
 {
  archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"}
- patches: ['StaticMeshPlugin-5.11.0.patch']
+ patches: ['StaticMeshPlugin-5.11.0.p001.patch']
+}
+
+version_5_11_0_DB11:
+{
+ archive_info : {archive_name : "StaticMeshPlugin-5.11.0-8801743.tar.gz"}
+ patches: ['StaticMeshPlugin-5.11.0.p001.patch', 'StaticMeshPlugin-5.11.0.p002.patch']
 }
 
 version_5_8_0:
diff --git a/products/patches/StaticMeshPlugin-5.11.0.p001.patch b/products/patches/StaticMeshPlugin-5.11.0.p001.patch
new file mode 100644
index 0000000..833f61b
--- /dev/null
+++ b/products/patches/StaticMeshPlugin-5.11.0.p001.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
++)
diff --git a/products/patches/StaticMeshPlugin-5.11.0.patch b/products/patches/StaticMeshPlugin-5.11.0.patch
deleted file mode 100644
index 833f61b..0000000
--- a/products/patches/StaticMeshPlugin-5.11.0.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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
-+)