From 9d3b3bf2586e1e2a1a1cb27b373ccb879ffb86db Mon Sep 17 00:00:00 2001
From: rnv <rnv@opencascade.com>
Date: Tue, 13 Sep 2011 09:03:12 +0000
Subject: [PATCH] Implementation of the "20494: EDF 1123 KERNEL/GUI :
 Improvment of 'About' dialog box" issue.

---
 configure.ac                                  | 1 +
 resources/Makefile.am                         | 2 +-
 resources/{SalomeApp.xml => SalomeApp.xml.in} | 1 +
 src/SMESHGUI/Makefile.am                      | 1 +
 src/SMESHGUI/SMESHGUI.cxx                     | 6 ++++++
 5 files changed, 10 insertions(+), 1 deletion(-)
 rename resources/{SalomeApp.xml => SalomeApp.xml.in} (99%)

diff --git a/configure.ac b/configure.ac
index 6a8498e43..b1de4d2f4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -522,6 +522,7 @@ AC_OUTPUT([ \
   src/Tools/MeshCut/Makefile \
   resources/Makefile \
   resources/SMESHCatalog.xml \
+  resources/SalomeApp.xml \
   idl/Makefile \
   Makefile
 ])
diff --git a/resources/Makefile.am b/resources/Makefile.am
index 3f949cfb4..f4f556208 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -148,7 +148,7 @@ dist_salomeres_DATA = \
 	mesh_merge_elements.png \
 	select1.png \
 	StdMeshers.xml \
-	SalomeApp.xml \
+	$(top_builddir)/resources/SalomeApp.xml \
 	mesh_pattern.png \
 	pattern_sample_2d.png \
 	pattern_sample_3D.png \
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml.in
similarity index 99%
rename from resources/SalomeApp.xml
rename to resources/SalomeApp.xml.in
index a0958857e..133192ed8 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml.in
@@ -26,6 +26,7 @@
     <!-- Major module parameters -->
     <parameter name="name" value="Mesh"/>
     <parameter name="icon" value="ModuleMesh.png"/>
+    <parameter name="SMESH_VERSION" value="@VERSION@"/>
     <!-- Other module preferences -->
     <parameter name="node_color"                   value="255, 0,   0"/>
     <parameter name="fill_color"                   value="0, 170, 255"/>
diff --git a/src/SMESHGUI/Makefile.am b/src/SMESHGUI/Makefile.am
index f65fd7528..c0d478066 100644
--- a/src/SMESHGUI/Makefile.am
+++ b/src/SMESHGUI/Makefile.am
@@ -260,6 +260,7 @@ libSMESH_la_CPPFLAGS = \
 	-I$(srcdir)/../SMESH_I \
 	-I$(srcdir)/../Controls \
 	-I$(srcdir)/../SMESHClient \
+	-I$(top_builddir) \
 	-I$(top_builddir)/idl
 
 libSMESH_la_LDFLAGS  = \
diff --git a/src/SMESHGUI/SMESHGUI.cxx b/src/SMESHGUI/SMESHGUI.cxx
index bfb3d2d30..94f893e5e 100644
--- a/src/SMESHGUI/SMESHGUI.cxx
+++ b/src/SMESHGUI/SMESHGUI.cxx
@@ -85,6 +85,8 @@
 #include "SMESHGUI_VTKUtils.h"
 #include "SMESHGUI_HypothesesUtils.h"
 
+#include <SMESH_version.h>
+
 #include <SMESH_Client.hxx>
 #include <SMESH_Actor.h>
 #include <SMESH_ScalarBarActor.h>
@@ -1589,6 +1591,10 @@ extern "C" {
   {
     return new SMESHGUI();
   }
+
+  SMESHGUI_EXPORT  char* getModuleVersion() {
+    return SMESH_VERSION_STR;
+  }
 }
 
 SMESH::SMESH_Gen_var SMESHGUI::myComponentSMESH = SMESH::SMESH_Gen::_nil();
-- 
2.30.2