From: vsr <vsr@opencascade.com>
Date: Thu, 13 Dec 2012 08:36:11 +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=00de74b561f7a67e0316c2fc0833aa95be44b099;p=samples%2Fatomsolv.git

Merge from V6_main 13/12/2012
---

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index e38703f..9afd411 100755
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -19,6 +19,7 @@
 
 using namespace std;
 #include "ATOMSOLV.hxx"
+#include "ATOMSOLV_version.h"
 #include "utilities.h"
 
 #include <string>
@@ -82,6 +83,14 @@ CORBA::Boolean ATOMSOLV::processData( CORBA::Long studyID )
   return true;
 }
 
+char* ATOMSOLV::getVersion()
+{
+#if ATOMSOLV_DEVELOPMENT
+  return CORBA::string_dup(ATOMSOLV_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(ATOMSOLV_VERSION_STR);
+#endif
+}
 
 extern "C"
 {
diff --git a/src/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx
index bb0a5d4..9df0d2d 100644
--- a/src/ATOMSOLV/ATOMSOLV.hxx
+++ b/src/ATOMSOLV/ATOMSOLV.hxx
@@ -43,6 +43,7 @@ public:
   CORBA::Boolean setData( CORBA::Long studyID, const ATOMSOLV_ORB::TMoleculeList& theData );
   CORBA::Boolean getData( CORBA::Long studyID, ATOMSOLV_ORB::TMoleculeList_out outData );
   CORBA::Boolean processData( CORBA::Long studyID );
+  virtual char*  getVersion();
 
 private:
   std::map<long, ATOMSOLV_ORB::TMoleculeList*> myData;
diff --git a/src/ATOMSOLV/Makefile.am b/src/ATOMSOLV/Makefile.am
index 1da4ccc..aa8e291 100644
--- a/src/ATOMSOLV/Makefile.am
+++ b/src/ATOMSOLV/Makefile.am
@@ -32,6 +32,7 @@ libATOMSOLVEngine_la_CPPFLAGS = \
 	$(CORBA_INCLUDES) \
 	$(KERNEL_CXXFLAGS) \
 	-I$(ATOMGEN_ROOT_DIR)/include/salome \
-	-I$(top_builddir)/idl
+	-I$(top_builddir)/idl \
+	-I$(top_builddir)
 
 libATOMSOLVEngine_la_LDFLAGS = ../../idl/libATOMSOLVIDL.la $(KERNEL_LDFLAGS) -lSalomeContainer -lOpUtil