rename medtool as medcoupling

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c8c80ec3b7a9585daa356d623a1ef12dafba2cb5..bf368271aca854098f5a2398707b3804798414db 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -153,7 +153,7 @@ IF(SALOME_BUILD_DOC)
   SALOME_LOG_OPTIONAL_PACKAGE(Sphinx SALOME_BUILD_DOC)
 ENDIF(SALOME_BUILD_DOC)
 
-FIND_PACKAGE(MEDtool)
+FIND_PACKAGE(MEDCoupling)
 
 # Detection report
 SALOME_PACKAGE_REPORT_AND_CHECK()

diff --git a/adm_local/cmake_files/FindMEDCoupling.cmake b/adm_local/cmake_files/FindMEDCoupling.cmake
new file mode 100644 (file)
index 0000000..9496124
--- /dev/null
+++ b/adm_local/cmake_files/FindMEDCoupling.cmake
@@ -0,0 +1,64 @@
+# Copyright (C) 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
+#
+
+
+# Find MEDCoupling installation
+#
+# The following variable are set:
+#   MEDCOUPLING_INCLUDE_DIRS
+#   INTERPKERNEL_LIBRARY
+#   MEDCOUPLING_LIBRARY
+#   MEDLOADER_LIBRARY
+#   MEDCOUPLING_LIBRARIES
+#   MEDCOUPLING_PYTHON_DIRS
+#
+#  The CMake (or environment) variable MEDCOUPLING_ROOT_DIR can be set to
+#  guide the detection and indicate a root directory to look into.
+#
+
+MESSAGE(STATUS "Check for MEDCoupling ...")
+
+SET(MEDCOUPLING_ROOT_DIR $ENV{MEDCOUPLING_ROOT_DIR} CACHE PATH "Path to the MEDCoupling.")
+IF(MEDCOUPLING_ROOT_DIR)
+  LIST(APPEND CMAKE_PREFIX_PATH "${MEDCOUPLING_ROOT_DIR}")
+ENDIF(MEDCOUPLING_ROOT_DIR)
+
+FIND_PATH(MEDCOUPLING_INCLUDE_DIRS MEDCoupling.hxx) # mandatory
+
+FIND_LIBRARY(INTERPKERNEL_LIBRARY NAMES interpkernel) # mandatory
+FIND_LIBRARY(MEDCOUPLING_REMAPPER_LIBRARY NAMES medcouplingremapper) # mandatory
+FIND_LIBRARY(MEDCOUPLING_LIBRARY NAMES medcoupling) # mandatory
+FIND_LIBRARY(MEDLOADER_LIBRARY NAMES medloader) # optional
+FIND_LIBRARY(MEDPARTITIONERCPP_LIBRARY NAMES medpartitionercpp) # optional
+FIND_LIBRARY(RENUMBERCPP_LIBRARY NAMES renumbercpp) # optional
+
+FIND_PACKAGE(PythonInterp QUIET)
+FIND_PATH(MEDCOUPLING_PYTHON_DIRS NAMES MEDCoupling.py MEDLoader.py PATH_SUFFIXES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) # optional
+
+SET(MEDCOUPLING_LIBRARIES
+  ${INTERPKERNEL_LIBRARY}
+  ${MEDCOUPLING_REMAPPER_LIBRARY}
+  ${MEDCOUPLING_LIBRARY}
+  ${MEDLOADER_LIBRARY}
+  ${MEDPARTITIONERCPP_LIBRARY}
+  ${RENUMBERCPP_LIBRARY}
+  )
+
+INCLUDE(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDCoupling REQUIRED_VARS MEDCOUPLING_INCLUDE_DIRS MEDCOUPLING_LIBRARIES)

diff --git a/adm_local/cmake_files/FindMEDtool.cmake b/adm_local/cmake_files/FindMEDtool.cmake
deleted file mode 100644 (file)
index 831a34e..0000000
--- a/adm_local/cmake_files/FindMEDtool.cmake
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright (C) 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
-#
-
-
-# Find MEDtool installation
-#
-# The following variable are set:
-#   MEDTOOL_INCLUDE_DIRS
-#   INTERPKERNEL_LIBRARY
-#   MEDCOUPLING_LIBRARY
-#   MEDLOADER_LIBRARY
-#   MEDTOOL_LIBRARIES
-#   MEDTOOL_PYTHON_DIRS
-#
-#  The CMake (or environment) variable MEDTOOL_ROOT_DIR can be set to
-#  guide the detection and indicate a root directory to look into.
-#
-
-MESSAGE(STATUS "Check for MEDtool ...")
-
-SET(MEDTOOL_ROOT_DIR $ENV{MEDTOOL_ROOT_DIR} CACHE PATH "Path to the MEDtool.")
-IF(MEDTOOL_ROOT_DIR)
-  LIST(APPEND CMAKE_PREFIX_PATH "${MEDTOOL_ROOT_DIR}")
-ENDIF(MEDTOOL_ROOT_DIR)
-
-FIND_PATH(MEDTOOL_INCLUDE_DIRS MEDCoupling.hxx) # mandatory
-
-FIND_LIBRARY(INTERPKERNEL_LIBRARY NAMES interpkernel) # mandatory
-FIND_LIBRARY(MEDCOUPLING_REMAPPER_LIBRARY NAMES medcouplingremapper) # mandatory
-FIND_LIBRARY(MEDCOUPLING_LIBRARY NAMES medcoupling) # mandatory
-FIND_LIBRARY(MEDLOADER_LIBRARY NAMES medloader) # optional
-FIND_LIBRARY(MEDPARTITIONERCPP_LIBRARY NAMES medpartitionercpp) # optional
-FIND_LIBRARY(RENUMBERCPP_LIBRARY NAMES renumbercpp) # optional
-
-FIND_PACKAGE(PythonInterp QUIET)
-FIND_PATH(MEDTOOL_PYTHON_DIRS NAMES MEDCoupling.py MEDLoader.py PATH_SUFFIXES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) # optional
-
-SET(MEDTOOL_LIBRARIES
-  ${INTERPKERNEL_LIBRARY}
-  ${MEDCOUPLING_REMAPPER_LIBRARY}
-  ${MEDCOUPLING_LIBRARY}
-  ${MEDLOADER_LIBRARY}
-  ${MEDPARTITIONERCPP_LIBRARY}
-  ${RENUMBERCPP_LIBRARY}
-  )
-
-INCLUDE(FindPackageHandleStandardArgs)
-FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDtool REQUIRED_VARS MEDTOOL_INCLUDE_DIRS MEDTOOL_LIBRARIES)

diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt
index 7323cd6edcd4e0e15fb8e3038ff9fab37bd51638..108bf17513395df8978f7e62522732b3fcddde19 100644 (file)
--- a/src/MEDCalc/cmp/CMakeLists.txt
+++ b/src/MEDCalc/cmp/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
   ${HDF5_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${PYTHON_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}
   ${PROJECT_BINARY_DIR}/idl
 )
@@ -55,7 +55,7 @@ SET(COMMON_LIBS
   ${KERNEL_TOOLSDS} ${KERNEL_SalomeHDFPersist} ${KERNEL_SalomeContainer} ${KERNEL_SalomeCommunication}
   ${KERNEL_SalomeKernelHelpers} ${KERNEL_SalomeLifeCycleCORBA} ${KERNEL_SALOMELocalTrace} ${KERNEL_SALOMEBasics}
   ${KERNEL_SalomeGenericObj}
-  ${MEDTOOL_LIBRARIES}
+  ${MEDCOUPLING_LIBRARIES}
   ${MEDFILE_C_LIBRARIES}
   ${HDF5_LIBRARIES}
   ${OMNIORB_LIBRARIES}

diff --git a/src/MEDCalculator/CMakeLists.txt b/src/MEDCalculator/CMakeLists.txt
index 2598c773ad20fb06079d76b12f2e2f425b582fca..7bcbefa3adff544cb94ce04d3c3a4b1a268ed380 100644 (file)
--- a/src/MEDCalculator/CMakeLists.txt
+++ b/src/MEDCalculator/CMakeLists.txt
@@ -32,7 +32,7 @@ INCLUDE_DIRECTORIES(
   ${HDF5_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba
   )

diff --git a/src/MEDCalculator/Swig/CMakeLists.txt b/src/MEDCalculator/Swig/CMakeLists.txt
index 796afa74ae4e47501e41622d83466e5b9136f003..4fb862f2019f8f9546e69280912cb3e56b68c0ba 100644 (file)
--- a/src/MEDCalculator/Swig/CMakeLists.txt
+++ b/src/MEDCalculator/Swig/CMakeLists.txt
@@ -27,7 +27,7 @@ INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   )

diff --git a/src/MEDCalculator/Test/CMakeLists.txt b/src/MEDCalculator/Test/CMakeLists.txt
index 79122cc9bd170d401cf060720d39e3e24b6376b9..9f38b8f82cef7f224534210551eef71861858b3c 100644 (file)
--- a/src/MEDCalculator/Test/CMakeLists.txt
+++ b/src/MEDCalculator/Test/CMakeLists.txt
@@ -25,7 +25,7 @@ INCLUDE_DIRECTORIES(
   ${CPPUNIT_INCLUDE_DIRS}
   ${HDF5_INCLUDE_DIRS}
   ${MEDFILE_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../Swig
   )

diff --git a/src/MEDCouplingCorba/CMakeLists.txt b/src/MEDCouplingCorba/CMakeLists.txt
index f8309ca016dc589928fa10138bbb5768b65ca5a5..b32c40f618345d876b8582ec18c18b3f0530b670 100644 (file)
--- a/src/MEDCouplingCorba/CMakeLists.txt
+++ b/src/MEDCouplingCorba/CMakeLists.txt
@@ -28,7 +28,7 @@ ENDIF(SALOME_BUILD_TESTS)
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   )
 

diff --git a/src/MEDCouplingCorba/Client/CMakeLists.txt b/src/MEDCouplingCorba/Client/CMakeLists.txt
index df1b1b637e31561e6dbfaab6dc2a812545f8370f..6834ab4b0490090b894f9f8a70aa7ce84e9afe40 100644 (file)
--- a/src/MEDCouplingCorba/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Client/CMakeLists.txt
@@ -20,7 +20,7 @@
 
 INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   )
 

diff --git a/src/MEDCouplingCorba/Test/CMakeLists.txt b/src/MEDCouplingCorba/Test/CMakeLists.txt
index 99dd35cf93ea3887e909c17e0116123b636a114a..8699f00c2b0b46483b6b3b59f5ed9350c1e0cf4c 100644 (file)
--- a/src/MEDCouplingCorba/Test/CMakeLists.txt
+++ b/src/MEDCouplingCorba/Test/CMakeLists.txt
@@ -22,7 +22,7 @@ INCLUDE_DIRECTORIES(
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
   ${PTHREAD_INCLUDE_DIR}
   ${CPPUNIT_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}/..
   ${CMAKE_CURRENT_SOURCE_DIR}/../Client

diff --git a/src/MEDCouplingCorba_Swig/CMakeLists.txt b/src/MEDCouplingCorba_Swig/CMakeLists.txt
index f19188f4edc274df1ff629e0dae884fa771f0eda..169d2496b6d2be829ef82612a29f2dba664693fe 100644 (file)
--- a/src/MEDCouplingCorba_Swig/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/CMakeLists.txt
@@ -35,7 +35,7 @@ SET(MEDCouplingCorba_SWIG_DPYS_FILES
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../MEDCouplingCorba

diff --git a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
index 1b82f061684f6b7fbf081f86a14e9d287bf35063..2bcdd9559dfe52f30ff66e3c5802c8ef8533bf30 100644 (file)
--- a/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
+++ b/src/MEDCouplingCorba_Swig/Client/CMakeLists.txt
@@ -30,7 +30,7 @@ SET(SWIG_MODULE_MEDCouplingClient_EXTRA_FLAGS ${SWIG_EXTRA_FLAGS_FOR_NUMPYANDSCI
 INCLUDE_DIRECTORIES(
   ${PYTHON_INCLUDE_DIRS}
   ${OMNIORB_INCLUDE_DIR} ${OMNIORB_INCLUDE_DIRS}
-  ${MEDTOOL_INCLUDE_DIRS}
+  ${MEDCOUPLING_INCLUDE_DIRS}
   ${CMAKE_CURRENT_BINARY_DIR}/../../../idl
   ${CMAKE_CURRENT_SOURCE_DIR}
   ${CMAKE_CURRENT_SOURCE_DIR}/../../MEDCouplingCorba/Client