From: vsr <vsr@opencascade.com>
Date: Thu, 13 Dec 2012 08:49:52 +0000 (+0000)
Subject: Merge from V6_main 13/12/2012
X-Git-Tag: V7_1_0_pre
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=71804d75cbe0acc297084ae4105830f1f8d35b8a;p=samples%2Fhello.git

Merge from V6_main 13/12/2012
---

diff --git a/src/HELLO/HELLO.cxx b/src/HELLO/HELLO.cxx
index e135222..42de33e 100755
--- a/src/HELLO/HELLO.cxx
+++ b/src/HELLO/HELLO.cxx
@@ -21,6 +21,7 @@
 //
 
 #include "HELLO.hxx"
+#include "HELLO_version.h"
 
 #include <SALOMEconfig.h>
 #include CORBA_CLIENT_HEADER(SALOMEDS)
@@ -248,6 +249,16 @@ void HELLO::copyOrMove( const HELLO_ORB::object_list& what,
   }
 }
 
+// Version information
+char* HELLO::getVersion()
+{
+#if HELLO_DEVELOPMENT
+  return CORBA::string_dup(HELLO_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(HELLO_VERSION_STR);
+#endif
+}
+
 extern "C"
 {
   /*!
diff --git a/src/HELLO/HELLO.hxx b/src/HELLO/HELLO.hxx
index 01d892c..25d869f 100644
--- a/src/HELLO/HELLO.hxx
+++ b/src/HELLO/HELLO.hxx
@@ -44,6 +44,7 @@ public:
   void              copyOrMove( const HELLO_ORB::object_list& what,
 				SALOMEDS::SObject_ptr where,
 				CORBA::Long row, CORBA::Boolean isCopy );
+  virtual char*     getVersion();
 };
 
 extern "C"
diff --git a/src/HELLO/Makefile.am b/src/HELLO/Makefile.am
index 5a93b3b..5e96bf3 100755
--- a/src/HELLO/Makefile.am
+++ b/src/HELLO/Makefile.am
@@ -36,7 +36,8 @@ libHELLOEngine_la_CPPFLAGS = \
 	$(CORBA_CXXFLAGS) \
 	$(CORBA_INCLUDES) \
 	$(KERNEL_CXXFLAGS) \
-	-I$(top_builddir)/idl
+	-I$(top_builddir)/idl \
+	-I$(top_builddir)
 
 libHELLOEngine_la_LDFLAGS = \
 	../../idl/libSalomeIDLHELLO.la \