From e58a23f320103c3e92a4087c4864008217534740 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Thu, 13 Dec 2012 13:05:26 +0000
Subject: [PATCH] Merge from V6_main 13/12/2012

---
 src/Sierpinsky/Makefile.am          |  3 ++-
 src/Sierpinsky/SIERPINSKY_Gen_i.cxx | 12 ++++++++++++
 src/Sierpinsky/SIERPINSKY_Gen_i.hxx |  3 +++
 3 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/Sierpinsky/Makefile.am b/src/Sierpinsky/Makefile.am
index 3589c15..4a178e2 100644
--- a/src/Sierpinsky/Makefile.am
+++ b/src/Sierpinsky/Makefile.am
@@ -42,7 +42,8 @@ libSIERPINSKYEngine_la_CPPFLAGS = \
 	$(MED_CXXFLAGS) \
 	$(HDF5_INCLUDES) \
 	$(BOOST_CPPFLAGS) \
-	-I$(top_builddir)/idl
+	-I$(top_builddir)/idl \
+	-I$(top_builddir)
 
 libSIERPINSKYEngine_la_LDFLAGS  = \
 	../../idl/libSalomeIDLSIERPINSKY.la \
diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
index daf5c99..b4c318c 100644
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.cxx
@@ -23,7 +23,9 @@
 // Created : 13/07/05
 ///////////////////////////////////////////////////////////
 //
+
 #include "SIERPINSKY_Gen_i.hxx"
+#include "SIERPINSKY_version.h"
 #include <MED_Factory.hxx>
 #include <gd.h>
 
@@ -189,3 +191,13 @@ CORBA::Boolean SIERPINSKY_Gen_i::ExportToMED( const char* theFileName, CORBA::Do
 
   return true;
 }
+
+// Version information
+char* SIERPINSKY_Gen_i::getVersion()
+{
+#if SIERPINSKY_DEVELOPMENT
+  return CORBA::string_dup(SIERPINSKY_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(SIERPINSKY_VERSION_STR);
+#endif
+}
diff --git a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
index 9fa4d59..4c516fa 100644
--- a/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
+++ b/src/Sierpinsky/SIERPINSKY_Gen_i.hxx
@@ -56,6 +56,9 @@ public:
   // Destructor
   ~SIERPINSKY_Gen_i();
   
+  // Version information
+  virtual char* getVersion();
+
   // Initializes engine with three reference points
   void Init( CORBA::Double theX1, CORBA::Double theY1, 
              CORBA::Double theX2, CORBA::Double theY2, 
-- 
2.39.2