From 95b26d8a2af49508de0aa373a3d73d99a3b2d075 Mon Sep 17 00:00:00 2001
From: abn <adrien.bruneton@cea.fr>
Date: Fri, 11 Dec 2015 15:22:18 +0100
Subject: [PATCH] Export configuration fix.

---
 CMakeLists.txt                                 | 11 +++++------
 cmake_files/CMakeLists.txt                     |  2 +-
 ...meMED.cmake => FindSalomeMEDCoupling.cmake} | 18 +++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)
 rename cmake_files/{FindSalomeMED.cmake => FindSalomeMEDCoupling.cmake} (71%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fb5104f6..3aa32d340 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -253,7 +253,6 @@ EXPORT(TARGETS ${_${PROJECT_NAME}_exposed_targets}
 #      Ensure the variables are always defined for the configure (even if empty):
 SET(MEDFILE_ROOT_DIR "${MEDFILE_ROOT_DIR}")
 SET(MPI_ROOT_DIR "${MPI_ROOT_DIR}")
-SET(HDF5_ROOT_DIR "${HDF5_ROOT_DIR}")
 SET(BOOST_ROOT_DIR "${BOOST_ROOT_DIR}")
 SET(SWIG_ROOT_DIR "${SWIG_ROOT_DIR}")
 SET(PYTHON_ROOT_DIR "${PYTHON_ROOT_DIR}")
@@ -270,17 +269,17 @@ 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 CppUnit Graphviz Doxygen Sphinx MPI  
-                         Boost libXml2 Python HDF5 MEDFile)
+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
-       HDF5_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)
+       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}
diff --git a/cmake_files/CMakeLists.txt b/cmake_files/CMakeLists.txt
index e7c9db0ed..0623d6443 100644
--- a/cmake_files/CMakeLists.txt
+++ b/cmake_files/CMakeLists.txt
@@ -20,7 +20,7 @@
 SET(admlocal_cmake_DATA
     FindMetis.cmake
     FindParMetis.cmake
-    FindSalomeMED.cmake
+    FindSalomeMEDCoupling.cmake
     FindSalomeMetis.cmake
     FindSalomeParMetis.cmake
     FindSalomeScotch.cmake
diff --git a/cmake_files/FindSalomeMED.cmake b/cmake_files/FindSalomeMEDCoupling.cmake
similarity index 71%
rename from cmake_files/FindSalomeMED.cmake
rename to cmake_files/FindSalomeMEDCoupling.cmake
index 0111f42bd..0a08f484a 100644
--- a/cmake_files/FindSalomeMED.cmake
+++ b/cmake_files/FindSalomeMEDCoupling.cmake
@@ -26,17 +26,17 @@
 # See explanation in FindSalomeKERNEL.cmake.
 #
 
-IF(NOT SalomeMED_FIND_QUIETLY)
-  MESSAGE(STATUS "Looking for Salome MED ...")
+IF(NOT SalomeMEDCoupling_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for MEDCoupling tool ...")
 ENDIF()
 
-SET(CMAKE_PREFIX_PATH "${MED_ROOT_DIR}")
-SALOME_FIND_PACKAGE(SalomeMED SalomeMED CONFIG)
+SET(CMAKE_PREFIX_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
+SALOME_FIND_PACKAGE(SalomeMEDCoupling MEDCoupling CONFIG)
 
-IF(NOT SalomeMED_FIND_QUIETLY)
-  MESSAGE(STATUS "Found Salome MED: ${MED_ROOT_DIR}")
+IF(NOT SalomeMEDCoupling_FIND_QUIETLY)
+  MESSAGE(STATUS "Found MEDCoupling: ${MEDCOUPLING_ROOT_DIR}")
 ENDIF()
 
-FOREACH(_res ${SalomeMED_EXTRA_ENV})
-  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeMED_EXTRA_ENV_${_res}}")
-ENDFOREACH()
\ No newline at end of file
+#FOREACH(_res ${SalomeMED_EXTRA_ENV})
+#  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeMED_EXTRA_ENV_${_res}}")
+#ENDFOREACH()
-- 
2.39.2