fix medcoupling api changes

diff --git a/src/MEDCalc/cmp/MEDPresentation.cxx b/src/MEDCalc/cmp/MEDPresentation.cxx
index 0b03774b5ce09382e529e6b8cdd2852663cec453..222a439b3875eed356c6a972a3f923d0a0f11a40 100644 (file)
--- 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 9f5f3fdab779cf175482c442d60dd2eeac025d1b..91d8f88f4d8bb7e44cff6cc6f95bc4542a1e26c6 100644 (file)
--- 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 aec534ad0befdbd6bf887a6670965bda05493373..ffad5a4aa64754f52a8ddecb1a8f230824d2b688 100644 (file)
--- 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