Merge from V6_main 13/12/2012

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index e38703f829f890b736523cb703084fd5604e2e06..9afd411e1bd45b64d9c32400e49c92f5fda8245a 100755 (executable)
--- 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 bb0a5d4d9add8c5f027eabff464b583d0c5556a0..9df0d2d5a34ac5d8d523602e656824524e4f5a4a 100644 (file)
--- 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 1da4cccd0c67b9a188c66796c6d1c4a095d4644b..aa8e29175d1c0c0a175efcb377463090c9a36c39 100644 (file)
--- 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