0021478: EDF 2083 ALL: Write the version of Salome used to create the study in the...

diff --git a/src/GEOM_I/GEOM_Gen_i.cc b/src/GEOM_I/GEOM_Gen_i.cc
index fe877f791556c7ede77273f58b7482b28a1ffa4a..3dec744598d0d66bea80c39edcbf6df1f18dc184 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.cc
+++ b/src/GEOM_I/GEOM_Gen_i.cc
@@ -28,6 +28,7 @@
 
 #include "GEOM_Gen_i.hh"
 #include "GEOM_Object_i.hh"
+#include "GEOM_version.h"
 
 #include <set>
 #include <sstream>
@@ -2551,6 +2552,16 @@ char* GEOM_Gen_i::getObjectInfo(CORBA::Long studyId, const char* entry)
   return ret;
 }
 
+// Version information
+char* GEOM_Gen_i::getVersion()
+{
+#if GEOM_DEVELOPMENT
+  return CORBA::string_dup(GEOM_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(GEOM_VERSION_STR);
+#endif
+}
+
 //=====================================================================================
 // EXPORTED METHODS
 //=====================================================================================

diff --git a/src/GEOM_I/GEOM_Gen_i.hh b/src/GEOM_I/GEOM_Gen_i.hh
index 9e65dea0c4d5aba489d1b1ff3d9196853fa0ffac..021ce1bcba72d97164b1e6ba58425101e9f07b6c 100644 (file)
--- a/src/GEOM_I/GEOM_Gen_i.hh
+++ b/src/GEOM_I/GEOM_Gen_i.hh
@@ -264,6 +264,9 @@ class GEOM_I_EXPORT GEOM_Gen_i: virtual public POA_GEOM::GEOM_Gen, virtual publi
   virtual bool hasObjectInfo();
   virtual char* getObjectInfo(CORBA::Long studyId, const char* entry);
 
+  // Version information
+  virtual char* getVersion();
+
   //-----------------------------------------------------------------------//
   // Internal methods                                                      //
   //-----------------------------------------------------------------------//

diff --git a/src/GEOM_I/Makefile.am b/src/GEOM_I/Makefile.am
index dfdba30a50f716037d4ce5b9a2c8fd77680d2707..b5cd511656359773f5bcc0f909ea7885ba03d385 100644 (file)
--- a/src/GEOM_I/Makefile.am
+++ b/src/GEOM_I/Makefile.am
@@ -81,7 +81,8 @@ libGEOMEngine_la_CPPFLAGS =           \
        -I$(srcdir)/../GEOMImpl         \
        -I$(srcdir)/../GEOMAlgo         \
        -I$(srcdir)/../GEOM             \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl           \
+       -I$(top_builddir)
 
 
 libGEOMEngine_la_LDFLAGS  =                    \