From 05ac9b7af14ab713f5d9d1e97053c9d9c1137fae Mon Sep 17 00:00:00 2001 From: vsr Date: Thu, 13 Dec 2012 12:31:25 +0000 Subject: [PATCH] Merge from V6_main 13/12/2012 --- src/CALCULATOR/CALCULATOR.cxx | 10 ++++++++++ src/CALCULATOR/CALCULATOR.hxx | 1 + src/CALCULATOR/Makefile.am | 1 + 3 files changed, 12 insertions(+) diff --git a/src/CALCULATOR/CALCULATOR.cxx b/src/CALCULATOR/CALCULATOR.cxx index 8f65736..e46793d 100644 --- 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 4188f49..9dc8f41 100644 --- 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 8d82185..3288dc8 100755 --- 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 = \ -- 2.30.2