From: vsr <vsr@opencascade.com>
Date: Tue, 16 Oct 2012 08:28:43 +0000 (+0000)
Subject: 0021478: EDF 2083 ALL: Write the version of Salome used to create the study in the... 
X-Git-Tag: V6_6_0a1~15
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=c5698502cc4ded2918de63cb6bee8437ac23b78e;p=modules%2Fsmesh.git

0021478: EDF 2083 ALL: Write the version of Salome used to create the study in the hdf file
---

diff --git a/src/SMESH_I/Makefile.am b/src/SMESH_I/Makefile.am
index 4f05fa7a4..08ba9b702 100644
--- 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 f3622c223..36fc71823 100644
--- 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 1165ac142..def206666 100644
--- 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
   // ============