Merge from V6_main 13/12/2012

diff --git a/src/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx
index 8f65736668c1cf076cd9258a235be2d02b029bda..e46793d1589707a3f1e79ff9301172892ab6d9b8 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.cxx
+++ b/src/CALCULATOR/CALCULATOR.cxx
@@ -21,6 +21,7 @@
 //
 
 #include "CALCULATOR.hxx"
+#include "CALCULATOR_version.h"
 
 #include "MEDCouplingFieldDoubleClient.hxx"
 #include "MEDCouplingMeshClient.hxx"
@@ -386,6 +387,15 @@ CALCULATOR_ORB::ErrorCode CALCULATOR::getErrorCode()
   return _errorCode;
 }
 
+// Version information
+char* CALCULATOR::getVersion()
+{
+#if CALCULATOR_DEVELOPMENT
+  return CORBA::string_dup(CALCULATOR_VERSION_STR"dev");
+#else
+  return CORBA::string_dup(CALCULATOR_VERSION_STR);
+#endif
+}
 
 //=============================================================================
 /*!

diff --git a/src/CALCULATOR/CALCULATOR.hxx b/src/CALCULATOR/CALCULATOR.hxx
index 4188f496ad0ddaa4871d4b4c87c9feb14e999f36..9dc8f41b12336d667f979245fddde4aa9331a5a8 100644 (file)
--- a/src/CALCULATOR/CALCULATOR.hxx
+++ b/src/CALCULATOR/CALCULATOR.hxx
@@ -40,6 +40,7 @@ public:
                const char *instanceName, 
                const char *interfaceName);
     virtual ~CALCULATOR();
+    virtual char* getVersion();
 
     CORBA::Double convergenceCriteria(SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr field);
     CORBA::Double normMax(SALOME_MED::MEDCouplingFieldDoubleCorbaInterface_ptr field1);

diff --git a/src/CALCULATOR/Makefile.am b/src/CALCULATOR/Makefile.am
index 8d82185700066b7fba36abbec40ce4f89c185576..3288dc823bec032d0852b4eb4cc4b3f72170dfc2 100755 (executable)
--- a/src/CALCULATOR/Makefile.am
+++ b/src/CALCULATOR/Makefile.am
@@ -37,6 +37,7 @@ libCALCULATOREngine_la_CPPFLAGS = \
        $(CORBA_INCLUDES) \
        $(MED_CXXFLAGS) \
        $(KERNEL_CXXFLAGS) \
+       -I$(top_builddir) \
        -I$(top_builddir)/idl
 
 libCALCULATOREngine_la_LDFLAGS = \