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

diff --git a/src/SMESH_I/Makefile.am b/src/SMESH_I/Makefile.am
index 4f05fa7a4ee6baf0d81f08dfa129f4607a6aea4d..08ba9b7021475c0b7c8d924aa5b2dab92b1d7a5d 100644 (file)
--- a/src/SMESH_I/Makefile.am
+++ b/src/SMESH_I/Makefile.am
@@ -109,7 +109,8 @@ libSMESHEngine_la_CPPFLAGS = \
        -I$(srcdir)/../DriverCGNS \
        -I$(srcdir)/../SMESH \
        -I$(srcdir)/../SMESHUtils \
-       -I$(top_builddir)/idl
+       -I$(top_builddir)/idl \
+       -I$(top_builddir)
 
 libSMESHEngine_la_LDFLAGS  = \
        ../../idl/libSalomeIDLSMESH.la \

diff --git a/src/SMESH_I/SMESH_Gen_i.cxx b/src/SMESH_I/SMESH_Gen_i.cxx
index f3622c22324b5da7574bdb3fe2c952724e060b3e..36fc71823b948695b28c56bd011811ba586cf1b7 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.cxx
+++ b/src/SMESH_I/SMESH_Gen_i.cxx
@@ -65,6 +65,7 @@
 #endif
 
 #include "SMESH_Gen_i.hxx"
+#include "SMESH_version.h"
 
 #include "SMDS_EdgePosition.hxx"
 #include "SMDS_FacePosition.hxx"
@@ -4914,6 +4915,16 @@ int SMESH_Gen_i::GetCurrentStudyID()
   return myCurrentStudy->_is_nil() || myCurrentStudy->_non_existent() ? -1 : myCurrentStudy->StudyId();
 }
 
+// Version information
+char* SMESH_Gen_i::getVersion()
+{
+#if SMESH_DEVELOPMENT
+  return CORBA::string_dup(SMESH_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(SMESH_VERSION_STR);
+#endif
+}
+
 //=============================================================================
 /*!
  *  SMESHEngine_factory

diff --git a/src/SMESH_I/SMESH_Gen_i.hxx b/src/SMESH_I/SMESH_Gen_i.hxx
index 1165ac142fa8c8267f707d0c112d9e6d48aa7e87..def2066662489b1e94d21cb31b3cfc9707f1bd5f 100644 (file)
--- a/src/SMESH_I/SMESH_Gen_i.hxx
+++ b/src/SMESH_I/SMESH_Gen_i.hxx
@@ -441,6 +441,12 @@ public:
     return aResultSO._retn();
   }
 
+  // ============
+  // Version information
+  // ============
+
+  virtual char* getVersion();
+
   // ============
   // Dump python
   // ============