From: Cédric Aguerre <cedric.aguerre@edf.fr>
Date: Fri, 22 Jan 2016 13:57:01 +0000 (+0100)
Subject: fix medcoupling api changes
X-Git-Tag: V8_1_0a1~31
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6b70a2c6e3ce558ac36cf4b1dc7967da5d4ae7cc;p=modules%2Fmed.git

fix medcoupling api changes
---

diff --git a/src/MEDCalc/cmp/MEDPresentation.cxx b/src/MEDCalc/cmp/MEDPresentation.cxx
index 0b03774b5..222a439b3 100644
--- a/src/MEDCalc/cmp/MEDPresentation.cxx
+++ b/src/MEDCalc/cmp/MEDPresentation.cxx
@@ -34,7 +34,7 @@ MEDPresentation::MEDPresentation(MEDPresentation::TypeID fieldHandlerId, std::st
 
   _fileName = dataSHandler->uri;
   _fieldName = fieldHandler->fieldname;
-  _fieldType = getFieldTypeString((ParaMEDMEM::TypeOfField) fieldHandler->type);
+  _fieldType = getFieldTypeString((MEDCoupling::TypeOfField) fieldHandler->type);
 
   if (_fileName.substr(0, 7) != std::string("file://")) {
     const char* msg = "Data source is not a file! Can not proceed.";
diff --git a/src/MEDCalc/cmp/MEDPresentation.hxx b/src/MEDCalc/cmp/MEDPresentation.hxx
index 9f5f3fdab..91d8f88f4 100644
--- a/src/MEDCalc/cmp/MEDPresentation.hxx
+++ b/src/MEDCalc/cmp/MEDPresentation.hxx
@@ -57,7 +57,7 @@ protected:
 private:
 
   void generatePipeline(); // reserved to friend class MEDPresentationManager
-  std::string getFieldTypeString(ParaMEDMEM::TypeOfField fieldType);
+  std::string getFieldTypeString(MEDCoupling::TypeOfField fieldType);
 
 protected:
 
diff --git a/src/MEDCalc/gui/CMakeLists.txt b/src/MEDCalc/gui/CMakeLists.txt
index aec534ad0..ffad5a4aa 100644
--- a/src/MEDCalc/gui/CMakeLists.txt
+++ b/src/MEDCalc/gui/CMakeLists.txt
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2015  CEA/DEN, EDF R&D
+# Copyright (C) 2012-2016  CEA/DEN, EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -43,6 +43,7 @@ INCLUDE_DIRECTORIES(
   ${Boost_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${GUI_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/dialogs
   ${CMAKE_CURRENT_BINARY_DIR}/dialogs