Export configuration fix.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5fb5104f6eb0606bf2aa0807ee05460536544495..3aa32d340595fae6d083e1b3e23d3daf75a03cd7 100644 (file)
--- 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 e7c9db0edfd8787d86e2bdeaef76b2effd1f06ce..0623d6443ab44c306894430f2d4d0a6325cde474 100644 (file)
--- 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/FindSalomeMED.cmake
deleted file mode 100644 (file)
index 0111f42..0000000
--- a/cmake_files/FindSalomeMED.cmake
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-# This library is free software; you can redistribute it and/or
-# modify it under the terms of the GNU Lesser General Public
-# License as published by the Free Software Foundation; either
-# version 2.1 of the License, or (at your option) any later version.
-#
-# This library is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# Lesser General Public License for more details.
-#
-# You should have received a copy 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
-#
-# Author: Adrien Bruneton
-#
-
-# MED detection for Salome - this is typically called by dependent modules
-# (PARAVIS, etc ...)
-#
-# The detection is simpler than for other prerequisites.
-# See explanation in FindSalomeKERNEL.cmake.
-#
-
-IF(NOT SalomeMED_FIND_QUIETLY)
-  MESSAGE(STATUS "Looking for Salome MED ...")
-ENDIF()
-
-SET(CMAKE_PREFIX_PATH "${MED_ROOT_DIR}")
-SALOME_FIND_PACKAGE(SalomeMED SalomeMED CONFIG)
-
-IF(NOT SalomeMED_FIND_QUIETLY)
-  MESSAGE(STATUS "Found Salome MED: ${MED_ROOT_DIR}")
-ENDIF()
-
-FOREACH(_res ${SalomeMED_EXTRA_ENV})
-  SALOME_ACCUMULATE_ENVIRONMENT(${_res} "${SalomeMED_EXTRA_ENV_${_res}}")
-ENDFOREACH()
\ No newline at end of file

diff --git a/cmake_files/FindSalomeMEDCoupling.cmake b/cmake_files/FindSalomeMEDCoupling.cmake
new file mode 100644 (file)
index 0000000..0a08f48
--- /dev/null
+++ b/cmake_files/FindSalomeMEDCoupling.cmake
@@ -0,0 +1,42 @@
+# Copyright (C) 2007-2015  CEA/DEN, EDF R&D, OPEN CASCADE
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy 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
+#
+# Author: Adrien Bruneton
+#
+
+# MED detection for Salome - this is typically called by dependent modules
+# (PARAVIS, etc ...)
+#
+# The detection is simpler than for other prerequisites.
+# See explanation in FindSalomeKERNEL.cmake.
+#
+
+IF(NOT SalomeMEDCoupling_FIND_QUIETLY)
+  MESSAGE(STATUS "Looking for MEDCoupling tool ...")
+ENDIF()
+
+SET(CMAKE_PREFIX_PATH "${MEDCOUPLING_ROOT_DIR}/cmake_files")
+SALOME_FIND_PACKAGE(SalomeMEDCoupling MEDCoupling CONFIG)
+
+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()