Salome HOME
Copyright update 2022
[tools/medcoupling.git] / CMakeLists.txt
index 0bf0392c298568e298f673bdc66f499b101f93e7..842dd4aeebce39ca0aabc73625ab0ce235ca4fe2 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (C) 2015  CEA/DEN, EDF R&D
+# Copyright (C) 2015-2022  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
 # License along with this library; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
+#
+
+CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11 FATAL_ERROR)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8.2 FATAL_ERROR)
-#INCLUDE(CMakeDependentOption)
+# Project name
+# ============
+# original
 PROJECT(MEDCoupling C CXX)
+# upper case
+STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
 
-# Ensure a proper linker behavior:
-CMAKE_POLICY(SET CMP0003 NEW)
 
-# Versioning
-# ===========
-# Project name, upper case
-STRING(TOUPPER ${PROJECT_NAME} PROJECT_NAME_UC)
+IF (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.3)
+  cmake_policy(SET CMP0057 NEW)
+  IF (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.13)
+    cmake_policy(SET CMP0078 OLD)
+  ENDIF()
+  IF (${CMAKE_VERSION} VERSION_GREATER_EQUAL 3.14)
+    cmake_policy(SET CMP0086 OLD)
+  ENDIF()
+ENDIF()
 
-SET(${PROJECT_NAME_UC}_MAJOR_VERSION 1)
-SET(${PROJECT_NAME_UC}_MINOR_VERSION 0)
-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 1)
 
-# Our own set of macros:
-LIST(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_files")
-INCLUDE(MEDCouplingMacros)
+# Common CMake macros
+SET(CONFIGURATION_ROOT_DIR $ENV{CONFIGURATION_ROOT_DIR} CACHE PATH "Path to the Salome CMake files")
+IF(EXISTS ${CONFIGURATION_ROOT_DIR})
+  LIST(APPEND CMAKE_MODULE_PATH "${CONFIGURATION_ROOT_DIR}/cmake")
+  INCLUDE(SalomeMacros NO_POLICY_SCOPE)
+ELSE()
+  MESSAGE(FATAL_ERROR "We absolutely need the Salome CMake configuration files, please define CONFIGURATION_ROOT_DIR !")
+ENDIF()
+
+# Versioning
+# ===========
+SALOME_SETUP_VERSION(9.9.0)
+MESSAGE(STATUS "Building ${PROJECT_NAME_UC} ${${PROJECT_NAME_UC}_VERSION} from \"${${PROJECT_NAME_UC}_GIT_SHA1}\"")
+
+# Platform setup
+# ==============
+INCLUDE(SalomeSetupPlatform)
+
+# [ABN]: use the below for aggressive code quality check: 
+#if( EXISTS "aaaa")
+#    add_definitions(-Weverything)
+#    add_definitions(-Wno-inconsistent-missing-override)
+#    add_definitions(-Wno-c++98-compat -Wno-c++98-compat-pedantic)
+#    add_definitions(-Wno-sign-conversion)
+#    add_definitions(-Wno-switch-enum)
+#
+#    add_definitions(-Wno-documentation-unknown-command) # \image in Doxygen
+#    add_definitions(-Wno-gnu-statement-expression)      # assert(...)
+#
+#    add_definitions(-Wno-reserved-id-macro -Wno-padded -Wno-weak-vtables -Wdouble-promotion -Wno-comma -Wno-unused-parameter)
+#    add_definitions(-Wno-unreachable-code-break -Wno-old-style-cast -Wno-deprecated -Wno-double-promotion)
+#    add_definitions(-Wno-exit-time-destructors -Wno-global-constructors -Wno-missing-prototypes)
+#    add_definitions(-Wno-covered-switch-default -Wno-weak-template-vtables -Wno-undefined-func-template -Wno-used-but-marked-unused)
+#    add_definitions(-Wno-unreachable-code-return -Wno-missing-noreturn -Wno-unused-member-function -Wno-header-hygiene)
+#    add_definitions(-Wno-ignored-qualifiers) # because of MED-file 
+#    add_definitions(-Wno-unused-function -Wno-unused-macros)
+#    add_definitions(-Wno-missing-field-initializers)
+#    add_definitions(-Wno-shadow)  # SWIG generates a lot of those ...
+#
+#    add_definitions(-Wno-float-equal)  # OUCH
+#endif()
 
 #
 # User options
 # ============
 INCLUDE(CMakeDependentOption)
-OPTION(MEDCOUPLING_MED_MICROMED "Build MED without MED file dependancy." OFF)
-OPTION(MEDCOUPLING_MED_ENABLE_PYTHON "Build PYTHON bindings." ON)
-OPTION(MEDCOUPLING_MED_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
-OPTION(MEDCOUPLING_MED_ENABLE_RENUMBER "Build Renumber." ON)
-OPTION(MEDCOUPLING_MED_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
+OPTION(MEDCOUPLING_MICROMED "Build MED without MED file dependency." OFF)
+OPTION(MEDCOUPLING_ENABLE_PYTHON "Build PYTHON bindings." ON)
+OPTION(MEDCOUPLING_ENABLE_PARTITIONER "Build MEDPartitioner." ON)
+OPTION(MEDCOUPLING_ENABLE_RENUMBER "Build Renumber." ON)
+OPTION(MEDCOUPLING_WITH_FILE_EXAMPLES "Install examples of files containing meshes and fields of different formats." ON)
 OPTION(MEDCOUPLING_USE_MPI "(Use MPI containers) - For MED this triggers the build of ParaMEDMEM." OFF)
 OPTION(MEDCOUPLING_BUILD_TESTS "Build MED tests." ON)
 OPTION(MEDCOUPLING_BUILD_DOC "Build MED doc." ON)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER;NOT MEDCOUPLING_USE_MPI" OFF)
-CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ON "MEDCOUPLING_MED_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+OPTION(MEDCOUPLING_BUILD_STATIC "Build MEDCoupling library in static mode." OFF)
+OPTION(MEDCOUPLING_USE_64BIT_IDS "Size of IDs to refer cells and nodes. 32 bits when OFF (default), 64 bits when ON." ON)
+
+IF(${MEDCOUPLING_USE_MPI})
+  SET(USE_METIS_NOT_PARMETIS OFF)
+ELSE()
+  SET(USE_METIS_NOT_PARMETIS ON)
+ENDIF()
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_METIS "Enable metis graph library in MEDPartitioner."  ${USE_METIS_NOT_PARMETIS}
+        "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_SCOTCH "Enable scotch graph library in MEDPartitioner." ON 
+        "MEDCOUPLING_ENABLE_PARTITIONER" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PARMETIS "Enable parmetis graph library in MEDPartitioner." ${MEDCOUPLING_USE_MPI} 
+        "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_PARTITIONER_PTSCOTCH "Enable ptscotch graph library in MEDPartitioner." ${MEDCOUPLING_USE_MPI} 
+        "MEDCOUPLING_ENABLE_PARTITIONER;MEDCOUPLING_USE_MPI" OFF)
+SET(XDR_DEFAULT_OPTION ON)
 IF(WIN32)
-  CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MED_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ON "NOT MEDCOUPLING_MED_MICROMED" OFF)
-ENDIF(WIN32)
+    SET(XDR_DEFAULT_OPTION OFF)
+ENDIF()
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_MEDLOADER_USE_XDR "Enable use of XDR for SauvReader." ${XDR_DEFAULT_OPTION} "NOT MEDCOUPLING_MICROMED" OFF)
+CMAKE_DEPENDENT_OPTION(MEDCOUPLING_BUILD_FRENCH_DOC "Generate MEDCOUPLING French documentation" OFF
+                       "MEDCOUPLING_BUILD_DOC" OFF)
+
+IF(MEDCOUPLING_BUILD_STATIC)
+    SET(BUILD_SHARED_LIBS 0)
+    SET(CMAKE_POSITION_INDEPENDENT_CODE 1) # -fPIC option
+ELSE()
+    SET(BUILD_SHARED_LIBS 1)
+ENDIF()
+
+IF(${MEDCOUPLING_PARTITIONER_PARMETIS} AND ${MEDCOUPLING_PARTITIONER_METIS})
+    MESSAGE(FATAL_ERROR "ParMetis and Metis are mutually exclusive! Make a choice (options MEDCOUPLING_PARTITIONER_METIS and MEDCOUPLING_PARTITIONER_PARMETIS).")
+ENDIF()
+
+IF(${MEDCOUPLING_PARTITIONER_PTSCOTCH} AND ${MEDCOUPLING_PARTITIONER_SCOTCH})
+    MESSAGE(FATAL_ERROR "PTScotch and Scotch are mutually exclusive! Make a choice (options MEDCOUPLING_PARTITIONER_SCOTCH and MEDCOUPLING_PARTITIONER_PTSCOTCH).")
+ENDIF()
 
 #
 # Set list of prerequisites
 # =========================
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
-  FIND_PACKAGE(HDF5 REQUIRED)
-  FIND_PACKAGE(MEDFile REQUIRED)
+IF(NOT MEDCOUPLING_MICROMED)
+  FIND_PACKAGE(SalomeHDF5 REQUIRED)
+  FIND_PACKAGE(SalomeMEDFile REQUIRED)
   # XDR stuff
-  IF(NOT WIN32)
-    FIND_PACKAGE(XDR REQUIRED)
-  ELSE(NOT WIN32)
-    IF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
-      FIND_PACKAGE(XDR REQUIRED)
-    ENDIF(MEDCOUPLING_MED_MEDLOADER_USE_XDR)
-  ENDIF(NOT WIN32)
+  IF(MEDCOUPLING_MEDLOADER_USE_XDR)
+      FIND_PACKAGE(SalomeXDR REQUIRED)
+  ENDIF(MEDCOUPLING_MEDLOADER_USE_XDR)
   # End of XDR Stuff
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
-    IF(DEFINED ENV{LIBXML2_ROOT_DIR})
-      SET(LIBXML2_ROOT_DIR $ENV{LIBXML2_ROOT_DIR} CACHE PATH "Path to the LibXml2.")
-      LIST(APPEND CMAKE_PREFIX_PATH "${LIBXML2_ROOT_DIR}")
-    ENDIF()
-    FIND_PACKAGE(LibXml2)
-    IF(MEDCOUPLING_MED_PARTITIONER_METIS)
-      FIND_PACKAGE(Metis)
-      ADD_DEFINITIONS("-DMED_ENABLE_METIS")
-    ENDIF(MEDCOUPLING_MED_PARTITIONER_METIS)
-    IF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
-      FIND_PACKAGE(Scotch)
-      ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
-    ENDIF(MEDCOUPLING_MED_PARTITIONER_SCOTCH)
-  ENDIF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
+    FIND_PACKAGE(SalomeLibXml2)
+    SALOME_LOG_OPTIONAL_PACKAGE(LibXml2 MEDCOUPLING_ENABLE_PARTITIONER)
+    IF(MEDCOUPLING_PARTITIONER_METIS)
+      FIND_PACKAGE(SalomeMetis)
+      SALOME_LOG_OPTIONAL_PACKAGE(Metis MEDCOUPLING_PARTITIONER_METIS)
+      IF(SalomeMetis_FOUND)
+         ADD_DEFINITIONS("-DMED_ENABLE_METIS")
+      ENDIF()
+    ENDIF(MEDCOUPLING_PARTITIONER_METIS)
+    IF(MEDCOUPLING_PARTITIONER_SCOTCH)
+      FIND_PACKAGE(SalomeScotch)
+      SALOME_LOG_OPTIONAL_PACKAGE(Scotch MEDCOUPLING_PARTITIONER_SCOTCH)
+      IF(SalomeScotch_FOUND)
+        ADD_DEFINITIONS("-DMED_ENABLE_SCOTCH")
+      ENDIF()
+    ENDIF(MEDCOUPLING_PARTITIONER_SCOTCH)
+  ENDIF(MEDCOUPLING_ENABLE_PARTITIONER)
+ENDIF(NOT MEDCOUPLING_MICROMED)
 
 ENABLE_TESTING() # let it outsite because even if MEDCOUPLING_BUILD_TESTS is OFF, python tests that not need additional compilation can be run.
 
 IF(MEDCOUPLING_BUILD_TESTS)
-  FIND_PACKAGE(CppUnit)
+  FIND_PACKAGE(SalomeCppUnit)
+  SALOME_LOG_OPTIONAL_PACKAGE(CppUnit SALOME_BUILD_TESTS)
 ENDIF(MEDCOUPLING_BUILD_TESTS)
 
 IF(MEDCOUPLING_USE_MPI)
-  FIND_PACKAGE(MPI REQUIRED)
+  FIND_PACKAGE(SalomeMPI REQUIRED)
   ADD_DEFINITIONS("-DHAVE_MPI")
-  SET(MPI_INCLUDE_DIRS ${MPI_C_INCLUDE_PATH} ${MPI_CXX_INCLUDE_PATH})
-  SET(MPI_LIBRARIES ${MPI_C_LIBRARIES} ${MPI_CXX_LIBRARIES})
-  SET(MPI_DEFINITIONS "${MPI_CXX_COMPILE_FLAGS}")
-
-  IF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
-    FIND_PACKAGE(ParMetis)
-    ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
-  ENDIF(MEDCOUPLING_MED_PARTITIONER_PARMETIS)
+  SALOME_ADD_MPI_TO_HDF5()
+  IF(MEDCOUPLING_PARTITIONER_PARMETIS)
+    FIND_PACKAGE(SalomeParMetis)
+    SALOME_LOG_OPTIONAL_PACKAGE(ParMetis MEDCOUPLING_PARTITIONER_PARMETIS)
+    IF (SalomeParMetis_FOUND)
+      ADD_DEFINITIONS("-DMED_ENABLE_PARMETIS")
+    ENDIF()
+  ENDIF(MEDCOUPLING_PARTITIONER_PARMETIS)
+  IF(MEDCOUPLING_PARTITIONER_PTSCOTCH)
+    FIND_PACKAGE(SalomePTScotch)
+    SALOME_LOG_OPTIONAL_PACKAGE(PTScotch MEDCOUPLING_PARTITIONER_PTSCOTCH)
+    IF(SalomePTScotch_FOUND)
+      ADD_DEFINITIONS("-DMED_ENABLE_PTSCOTCH")
+    ENDIF(SalomePTScotch_FOUND)
+  ENDIF(MEDCOUPLING_PARTITIONER_PTSCOTCH)
 ENDIF(MEDCOUPLING_USE_MPI)
 
-IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
-  IF(DEFINED ENV{BOOST_ROOT_DIR})
-    SET(BOOST_ROOT_DIR $ENV{BOOST_ROOT_DIR} CACHE PATH "Path to the Boost.")
-    LIST(APPEND CMAKE_PREFIX_PATH "${BOOST_ROOT_DIR}")
+IF(MEDCOUPLING_ENABLE_RENUMBER)
+  FIND_PACKAGE(SalomeBoost)
+  SALOME_LOG_OPTIONAL_PACKAGE(Boost MEDCOUPLING_ENABLE_RENUMBER)
+ENDIF(MEDCOUPLING_ENABLE_RENUMBER)
+
+IF(MEDCOUPLING_ENABLE_PYTHON)
+  FIND_PACKAGE(SalomePythonInterp)
+  FIND_PACKAGE(SalomePythonLibs)
+  FIND_PACKAGE(SalomeNumPySciPy)
+  FIND_PACKAGE(SalomeSWIG)
+  SALOME_LOG_OPTIONAL_PACKAGE(PythonInterp MEDCOUPLING_ENABLE_PYTHON)
+  SALOME_LOG_OPTIONAL_PACKAGE(PythonLibs MEDCOUPLING_ENABLE_PYTHON)
+  SALOME_LOG_OPTIONAL_PACKAGE(SWIG   MEDCOUPLING_ENABLE_PYTHON)
+  IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "2")
+    IF("${PYTHON_VERSION_MINOR}" LESS "7")
+      MESSAGE(FATAL_ERROR "MEDCoupling's Python requires at least Python 2.7 (you seem to have ${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}). Upgrade your Python, or turn off MEDCOUPLING_ENABLE_PYTHON")
+    ENDIF()
   ENDIF()
-  SET(Boost_USE_STATIC_LIBS        OFF)
-  SET(Boost_USE_MULTITHREADED      ON)
-  SET(Boost_USE_STATIC_RUNTIME     OFF)
-  SET(Boost_NO_BOOST_CMAKE         ON)
-  FIND_PACKAGE(Boost)
-ENDIF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  IF ("${PYTHON_VERSION_MAJOR}" STREQUAL "3")
+      MESSAGE(STATUS "Using Python 3")
+  ENDIF()
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 IF(MEDCOUPLING_BUILD_DOC)
-  FIND_PACKAGE(Doxygen)
-  FIND_PACKAGE(Graphviz)
-  FIND_PACKAGE(Sphinx)
+  FIND_PACKAGE(SalomeDoxygen)
+  FIND_PACKAGE(SalomeGraphviz)
+  FIND_PACKAGE(SalomeSphinx)
+  SALOME_LOG_OPTIONAL_PACKAGE(Doxygen MEDCOUPLING_BUILD_DOC)
+  SALOME_LOG_OPTIONAL_PACKAGE(Graphviz MEDCOUPLING_BUILD_DOC)
+  SALOME_LOG_OPTIONAL_PACKAGE(Sphinx MEDCOUPLING_BUILD_DOC)
 ENDIF(MEDCOUPLING_BUILD_DOC)
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
-  FIND_PACKAGE(PythonInterp)
-  GET_FILENAME_COMPONENT(_python_dir "${PYTHON_EXECUTABLE}" PATH)
-  GET_FILENAME_COMPONENT(CMAKE_INCLUDE_PATH "${_python_dir}/../include/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}" ABSOLUTE)
-  GET_FILENAME_COMPONENT(CMAKE_LIBRARY_PATH "${_python_dir}/../lib" ABSOLUTE)
-  SET(PythonLibs_FIND_VERSION "${PYTHON_VERSION}")
-  FIND_PACKAGE(PythonLibs)
-
-  FIND_PACKAGE(SWIG)
-  # Set the extra flags for SWIG for numpy and scipy
-  SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY)
-  IF(NUMPY_FOUND)
-    SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "-DWITH_NUMPY")
-  ENDIF(NUMPY_FOUND)
-  IF(SCIPY_FOUND)
-    SET(SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY "${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCIPY};-DWITH_SCIPY")
-  ENDIF(SCIPY_FOUND)
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+# Detection report
+SALOME_PACKAGE_REPORT_AND_CHECK()
 
 # Directories
 #
@@ -160,12 +239,12 @@ SET(MEDCOUPLING_INSTALL_TESTS tests CACHE PATH "Install path: MEDCoupling tests"
 SET(MEDCOUPLING_INSTALL_SCRIPT_PYTHON ${MEDCOUPLING_INSTALL_BINS} CACHE PATH "Install path: MEDCoupling Python scripts")
 SET(MEDCOUPLING_INSTALL_CMAKE_LOCAL cmake_files CACHE PATH "Install path: local MEDCoupling CMake files")
 
-IF(MEDCOUPLING_MED_ENABLE_PYTHON)
+IF(MEDCOUPLING_ENABLE_PYTHON)
   SET(_pydir lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages)
   SET(MEDCOUPLING_INSTALL_PYTHON ${_pydir} CACHE PATH "Install path: MEDCoupling Python stuff")
   SET(MEDCOUPLING_INSTALL_PYTHON_SHARED ${MEDCOUPLING_INSTALL_PYTHON}/shared_modules CACHE PATH
     "Install path: MEDCoupling Python shared modules")
-ENDIF(MEDCOUPLING_MED_ENABLE_PYTHON)
+ENDIF(MEDCOUPLING_ENABLE_PYTHON)
 
 SET(MEDCOUPLING_INSTALL_RES share/resources CACHE PATH "Install path: MEDCoupling resources")
 SET(MEDCOUPLING_INSTALL_DOC share/doc CACHE PATH "Install path: MEDCoupling documentation")
@@ -173,18 +252,16 @@ SET(MEDCOUPLING_INSTALL_DOC share/doc CACHE PATH "Install path: MEDCoupling docu
 # Med specific:
 
 SET(MEDCOUPLING_INSTALL_RES_DATA "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCoupling specific data")
-#SET(MEDCOUPLING_MED_INSTALL_RES_SCRIPTS "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCouplng specific scripts")
+#SET(MEDCOUPLING_INSTALL_RES_SCRIPTS "${MEDCOUPLING_INSTALL_RES}/med" CACHE PATH "Install path: MEDCouplng specific scripts")
 
 MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_BINS MEDCOUPLING_INSTALL_LIBS MEDCOUPLING_INSTALL_IDLS MEDCOUPLING_INSTALL_HEADERS)
 MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_SCRIPT_SCRIPTS MEDCOUPLING_INSTALL_SCRIPT_DATA MEDCOUPLING_INSTALL_SCRIPT_PYTHON)
 MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_APPLISKEL_SCRIPTS  MEDCOUPLING_INSTALL_APPLISKEL_PYTHON MEDCOUPLING_INSTALL_CMAKE MEDCOUPLING_INSTALL_CMAKE_LOCAL MEDCOUPLING_INSTALL_RES)
-MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_PYTHON MEDCOUPLING_INSTALL_PYTHON_SHARED MEDCOUPLING_MED_INSTALL_RES_DATA MEDCOUPLING_MED_INSTALL_RES_SCRIPTS MEDCOUPLING_INSTALL_DOC)
+MARK_AS_ADVANCED(MEDCOUPLING_INSTALL_PYTHON MEDCOUPLING_INSTALL_PYTHON_SHARED MEDCOUPLING_INSTALL_RES_DATA MEDCOUPLING_INSTALL_DOC)
 
 # Header configuration
 # ====================
-MEDCOUPLING_XVERSION(${PROJECT_NAME})
-CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/MEDCoupling_version.h.in ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling_version.h)
-INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/MEDCoupling_version.h DESTINATION ${MEDCOUPLING_INSTALL_HEADERS})
+SALOME_CONFIGURE_FILE(MEDCoupling_version.h.in MEDCoupling_version.h INSTALL ${MEDCOUPLING_INSTALL_HEADERS})
 
 # Accumulate environment variables for MED module
 #SALOME_ACCUMULATE_ENVIRONMENT(PYTHONPATH NOCHECK ${CMAKE_INSTALL_PREFIX}/${MEDCOUPLING_INSTALL_BINS}
@@ -198,50 +275,52 @@ IF(WIN32)
   ADD_DEFINITIONS("-D_USE_MATH_DEFINES")
 ENDIF(WIN32)
 
+INCLUDE_DIRECTORIES(${CMAKE_BINARY_DIR})
+
 ADD_SUBDIRECTORY(src)
-ADD_SUBDIRECTORY(cmake_files)
+ADD_SUBDIRECTORY(adm_local)
 
 IF(MEDCOUPLING_BUILD_DOC)
   ADD_SUBDIRECTORY(doc)
 ENDIF(MEDCOUPLING_BUILD_DOC)
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
-  IF(MEDCOUPLING_MED_WITH_FILE_EXAMPLES)
-    ADD_SUBDIRECTORY(resources)
-  ENDIF(MEDCOUPLING_MED_WITH_FILE_EXAMPLES)
-ENDIF(NOT MEDCOUPLING_MED_MICROMED)
+ADD_SUBDIRECTORY(resources)
+IF(MEDCOUPLING_ENABLE_PYTHON)
+  ADD_SUBDIRECTORY(v8_work)
+ENDIF()
 
 # Configuration export
 # ====================
+INCLUDE(CMakePackageConfigHelpers)
 
 # List of targets in this project we want to make visible to the rest of the world.
 # They all have to be INSTALL'd with the option "EXPORT ${PROJECT_NAME}TargetGroup"
 SET(_${PROJECT_NAME}_exposed_targets
-   interpkernel medcoupling medcouplingremapper)
+   interpkernel medcouplingcpp medcouplingremapper medicoco)
 
-IF(NOT MEDCOUPLING_MED_MICROMED)
+IF(NOT MEDCOUPLING_MICROMED)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets medloader)
-  IF(MEDCOUPLING_MED_ENABLE_RENUMBER)
+  IF(MEDCOUPLING_ENABLE_RENUMBER)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets renumbercpp)
   ENDIF()
-  IF(MEDCOUPLING_MED_ENABLE_PARTITIONER)
+  IF(MEDCOUPLING_ENABLE_PARTITIONER)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets medpartitionercpp)
     IF(MEDCOUPLING_BUILD_TESTS)
       LIST(APPEND _${PROJECT_NAME}_exposed_targets MEDPARTITIONERTest)
     ENDIF()
   ENDIF()
   IF(MEDCOUPLING_BUILD_TESTS)
-    LIST(APPEND _${PROJECT_NAME}_exposed_targets InterpKernelTest)
+    LIST(APPEND _${PROJECT_NAME}_exposed_targets InterpKernelTest InterpKernelTestUtils)
   ENDIF()
 ENDIF()
 
 IF(MEDCOUPLING_USE_MPI)
   LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedmem)
-  IF(NOT MEDCOUPLING_MED_MICROMED)
+  IF(NOT MEDCOUPLING_MICROMED)
     LIST(APPEND _${PROJECT_NAME}_exposed_targets paramedloader)
   ENDIF()
   IF(MEDCOUPLING_BUILD_TESTS)
-    IF(NOT MEDCOUPLING_MED_MICROMED)
+    IF(NOT MEDCOUPLING_MICROMED)
       LIST(APPEND _${PROJECT_NAME}_exposed_targets ParaMEDMEMTest)
     ENDIF()
   ENDIF()
@@ -253,58 +332,49 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
   FILE ${PROJECT_BINARY_DIR}/${PROJECT_NAME}Targets.cmake)
 
 # Create the configuration files:
-#   - in the build tree:
 
 #      Ensure the variables are always defined for the configure (even if empty):
-# SET(KERNEL_ROOT_DIR "${KERNEL_ROOT_DIR}")
-# SET(GUI_ROOT_DIR "${GUI_ROOT_DIR}")
-# SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
-# SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}")
-# SET(HDF5_ROOT_DIR "${HDF5_ROOT_DIR}")
-# SET(OMNIORB_ROOT_DIR "${OMNIORB_ROOT_DIR}")
-# SET(PTHREAD_ROOT_DIR "${PTHREAD_ROOT_DIR}")
-# SET(BOOST_ROOT_DIR "${BOOST_ROOT_DIR}")
-# SET(SWIG_ROOT_DIR "${SWIG_ROOT_DIR}")
-# SET(PYTHON_ROOT_DIR "${PYTHON_ROOT_DIR}")
-# SET(CPPUNIT_ROOT_DIR "${CPPUNIT_ROOT_DIR}")
-# SET(GRAPHVIZ_ROOT_DIR "${GRAPHVIZ_ROOT_DIR}")
-# SET(DOXYGEN_ROOT_DIR "${DOXYGEN_ROOT_DIR}")
-# SET(SPHINX_ROOT_DIR "${SPHINX_ROOT_DIR}")
-
-# SET(METIS_ROOT_DIR "${METIS_ROOT_DIR}")
-# SET(PARMETIS_ROOT_DIR "${PARMETIS_ROOT_DIR}")
-# SET(SCOTCH_ROOT_DIR "${SCOTCH_ROOT_DIR}")
-# SET(XDR_ROOT_DIR "${XDR_ROOT_DIR}")
-
-#   - in the install tree:
-#       Get the relative path of the include directory so
-#       we can register it in the generated configuration files:
+SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
+SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}")
+SET(BOOST_ROOT_DIR "${BOOST_ROOT_DIR}")
+SET(SWIG_ROOT_DIR "${SWIG_ROOT_DIR}")
+SET(PYTHON_ROOT_DIR "${PYTHON_ROOT_DIR}")
+SET(CPPUNIT_ROOT_DIR "${CPPUNIT_ROOT_DIR}")
+SET(GRAPHVIZ_ROOT_DIR "${GRAPHVIZ_ROOT_DIR}")
+SET(DOXYGEN_ROOT_DIR "${DOXYGEN_ROOT_DIR}")
+SET(SPHINX_ROOT_DIR "${SPHINX_ROOT_DIR}")
+
+SET(METIS_ROOT_DIR "${METIS_ROOT_DIR}")
+SET(PARMETIS_ROOT_DIR "${PARMETIS_ROOT_DIR}")
+SET(SCOTCH_ROOT_DIR "${SCOTCH_ROOT_DIR}")
+SET(XDR_ROOT_DIR "${XDR_ROOT_DIR}")
+
 SET(CONF_INCLUDE_DIRS "${CMAKE_INSTALL_PREFIX}/${INSTALL_INCLUDE_DIR}")
 
 # Build variables that will be expanded when configuring Salome<MODULE>Config.cmake:
-# SALOME_CONFIGURE_PREPARE(Metis ParMetis Scotch XDR CAS Qt4 CppUnit Graphviz Doxygen Sphinx MPI omniORB
-#                          PThread Boost libXml2 Python HDF5 MEDFile)
-
-# INCLUDE(CMakePackageConfigHelpers)
-# CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in
-#     ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
-#     INSTALL_DESTINATION "${MEDCOUPLING_INSTALL_CMAKE}_LOCAL"
-#     PATH_VARS CONF_INCLUDE_DIRS MEDCOUPLING_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX
-#        KERNEL_ROOT_DIR GUI_ROOT_DIR MEDFILE_ROOT_DIR MPI_ROOT_DIR
-#        HDF5_ROOT_DIR OMNIORB_ROOT_DIR PTHREAD_ROOT_DIR BOOST_ROOT_DIR
-#        SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR
-#        SPHINX_ROOT_DIR METIS_ROOT_DIR PARMETIS_ROOT_DIR SCOTCH_ROOT_DIR XDR_ROOT_DIR)
-
-#WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
-#    VERSION ${${PROJECT_NAME_UC}_VERSION}
-#    COMPATIBILITY AnyNewerVersion)
-
+SALOME_CONFIGURE_PREPARE(MEDFile MPI Boost Swig Python CppUnit Graphviz Doxygen Sphinx   
+                         Metis ParMetis Scotch XDR)
+
+CONFIGURE_PACKAGE_CONFIG_FILE(${PROJECT_NAME}Config.cmake.in 
+    ${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake
+    INSTALL_DESTINATION "${MEDCOUPLING_INSTALL_CMAKE_LOCAL}"
+    PATH_VARS CONF_INCLUDE_DIRS MEDCOUPLING_INSTALL_CMAKE_LOCAL CMAKE_INSTALL_PREFIX 
+       MEDFILE_ROOT_DIR MPI_ROOT_DIR
+       BOOST_ROOT_DIR SWIG_ROOT_DIR PYTHON_ROOT_DIR CPPUNIT_ROOT_DIR GRAPHVIZ_ROOT_DIR DOXYGEN_ROOT_DIR
+       SPHINX_ROOT_DIR 
+       METIS_ROOT_DIR PARMETIS_ROOT_DIR SCOTCH_ROOT_DIR XDR_ROOT_DIR)
+
+WRITE_BASIC_PACKAGE_VERSION_FILE(${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
+    VERSION ${${PROJECT_NAME_UC}_VERSION}
+    COMPATIBILITY AnyNewerVersion)
+  
 # Install the CMake configuration files:
-INSTALL(FILES
-  "${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake"
-  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
-  DESTINATION "${MEDCOUPLING_INSTALL_CMAKE_LOCAL}")
+INSTALL(FILES
+  "${PROJECT_BINARY_DIR}/to_install/${PROJECT_NAME}Config.cmake"
+  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake"
+  DESTINATION "${MEDCOUPLING_INSTALL_CMAKE_LOCAL}")
 
 # Install the export set for use with the install-tree
-#INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${MEDCOUPLING_INSTALL_CMAKE_LOCAL}"
-#        FILE ${PROJECT_NAME}Targets.cmake)
+INSTALL(EXPORT ${PROJECT_NAME}TargetGroup DESTINATION "${MEDCOUPLING_INSTALL_CMAKE_LOCAL}" 
+        FILE ${PROJECT_NAME}Targets.cmake)
+