Merge branch 'V9_7_BR'

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 345b2e393ce20252c436d131ec48a478421a8b40..7e08f7cfd712a4f5017dd6ef1c49be7de1c9cef1 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 7)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 0)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Common CMake macros
 # ===================

diff --git a/src/GHS3DPRLPlugin/CMakeLists.txt b/src/GHS3DPRLPlugin/CMakeLists.txt
index b0b0ce879b41ce0c239795de2a5c92e2c5e73fa2..0bc8aac3086b8310db122b22d15510b5ea26921f 100644 (file)
--- a/src/GHS3DPRLPlugin/CMakeLists.txt
+++ b/src/GHS3DPRLPlugin/CMakeLists.txt
@@ -26,6 +26,7 @@ INCLUDE_DIRECTORIES(
   ${MESHGEMS_INCLUDE_DIRS}
   ${SMESH_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${Boost_INCLUDE_DIRS}
   ${PROJECT_BINARY_DIR}/idl
 )