version of MED in medcoupling library.

diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt
index e2513eb99bb2fe38d6d47f377ebe1f4549d99af3..ad1c6fa2b4f20addc470ee3f5504e4168fd7bfe4 100644 (file)
--- a/src/MEDCoupling/CMakeLists.txt
+++ b/src/MEDCoupling/CMakeLists.txt
@@ -21,6 +21,7 @@
 ADD_SUBDIRECTORY(Test)
 
 INCLUDE_DIRECTORIES(
+  ${CMAKE_CURRENT_BINARY_DIR}/../..
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Bases
   ${CMAKE_CURRENT_SOURCE_DIR}/../INTERP_KERNEL/Geometric2D

diff --git a/src/MEDCoupling/MEDCouplingRefCountObject.cxx b/src/MEDCoupling/MEDCouplingRefCountObject.cxx
index af387699bd6034d2fe42dc97a37f4501ce36e58e..51ae08cdb5cf8bbb48cfcd34f98d9593d925191a 100644 (file)
--- a/src/MEDCoupling/MEDCouplingRefCountObject.cxx
+++ b/src/MEDCoupling/MEDCouplingRefCountObject.cxx
@@ -19,9 +19,20 @@
 // Author : Anthony Geay (CEA/DEN)
 
 #include "MEDCouplingRefCountObject.hxx"
+#include "MED_version.h"
 
 using namespace ParaMEDMEM;
 
+const char *ParaMEDMEM::MEDCouplingVersionStr()
+{
+  return SALOMEMED_VERSION_STR;
+}
+
+int ParaMEDMEM::MEDCouplingVersion()
+{
+  return SALOMEMED_VERSION;
+}
+
 RefCountObject::RefCountObject():_cnt(1)
 {
 }

diff --git a/src/MEDCoupling/MEDCouplingRefCountObject.hxx b/src/MEDCoupling/MEDCouplingRefCountObject.hxx
index f9084503e7618159511a81609646d2ba786613e5..51e77e19d19daad313bc890a1b7e016d72a7d6e9 100644 (file)
--- a/src/MEDCoupling/MEDCouplingRefCountObject.hxx
+++ b/src/MEDCoupling/MEDCouplingRefCountObject.hxx
@@ -50,6 +50,9 @@ namespace ParaMEDMEM
 
   typedef bool (*FunctionToEvaluate)(const double *pos, double *res);
 
+  const char *MEDCouplingVersionStr();
+  int MEDCouplingVersion();
+
   class MEDCOUPLING_EXPORT RefCountObject
   {
   protected:

diff --git a/src/MEDCoupling/Makefile.am b/src/MEDCoupling/Makefile.am
index 77b16226db23de1f8970310624a252d913a95ffe..2434ecf7d40ae46d7fb180aa89dd33dcab484752 100644 (file)
--- a/src/MEDCoupling/Makefile.am
+++ b/src/MEDCoupling/Makefile.am
@@ -56,7 +56,7 @@ dist_libmedcoupling_la_SOURCES = \
 libmedcoupling_la_LDFLAGS= 
 
 libmedcoupling_la_CPPFLAGS=  @CXXTMPDPTHFLAGS@ \
-       -I$(srcdir) -I$(srcdir)/../INTERP_KERNEL/Bases \
+       -I$(top_builddir) -I$(srcdir) -I$(srcdir)/../INTERP_KERNEL/Bases \
        -I$(srcdir)/../INTERP_KERNEL -I$(srcdir)/../INTERP_KERNEL/Geometric2D \
        -I$(srcdir)/../INTERP_KERNEL/ExprEval -I$(srcdir)/../INTERP_KERNEL/GaussPoints