From 39b2f53bb4bd5f7b7758cd63194852704d207ff9 Mon Sep 17 00:00:00 2001 From: ageay Date: Tue, 16 Oct 2012 12:11:33 +0000 Subject: [PATCH] version of MED in medcoupling library. --- src/MEDCoupling/CMakeLists.txt | 1 + src/MEDCoupling/MEDCouplingRefCountObject.cxx | 11 +++++++++++ src/MEDCoupling/MEDCouplingRefCountObject.hxx | 3 +++ src/MEDCoupling/Makefile.am | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/src/MEDCoupling/CMakeLists.txt b/src/MEDCoupling/CMakeLists.txt index e2513eb99..ad1c6fa2b 100644 --- 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 af387699b..51ae08cdb 100644 --- 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 f9084503e..51e77e19d 100644 --- 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 77b16226d..2434ecf7d 100644 --- 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 -- 2.39.2