From 87b9492e999fc30ff924f3d4655ca41d7b2f3244 Mon Sep 17 00:00:00 2001 From: =?utf8?q?C=C3=A9dric=20Aguerre?= Date: Wed, 2 Dec 2015 15:28:28 +0100 Subject: [PATCH] rename medtool as medcoupling --- CMakeLists.txt | 2 +- ...indMEDtool.cmake => FindMEDCoupling.cmake} | 28 +++++++++---------- src/MEDCalc/cmp/CMakeLists.txt | 4 +-- src/MEDCalculator/CMakeLists.txt | 2 +- src/MEDCalculator/Swig/CMakeLists.txt | 2 +- src/MEDCalculator/Test/CMakeLists.txt | 2 +- src/MEDCouplingCorba/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Client/CMakeLists.txt | 2 +- src/MEDCouplingCorba/Test/CMakeLists.txt | 2 +- src/MEDCouplingCorba_Swig/CMakeLists.txt | 2 +- .../Client/CMakeLists.txt | 2 +- 11 files changed, 25 insertions(+), 25 deletions(-) rename adm_local/cmake_files/{FindMEDtool.cmake => FindMEDCoupling.cmake} (67%) diff --git a/CMakeLists.txt b/CMakeLists.txt index c8c80ec3b..bf368271a 100644 --- 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/FindMEDtool.cmake b/adm_local/cmake_files/FindMEDCoupling.cmake similarity index 67% rename from adm_local/cmake_files/FindMEDtool.cmake rename to adm_local/cmake_files/FindMEDCoupling.cmake index 831a34eec..9496124d0 100644 --- a/adm_local/cmake_files/FindMEDtool.cmake +++ b/adm_local/cmake_files/FindMEDCoupling.cmake @@ -18,28 +18,28 @@ # -# Find MEDtool installation +# Find MEDCoupling installation # # The following variable are set: -# MEDTOOL_INCLUDE_DIRS +# MEDCOUPLING_INCLUDE_DIRS # INTERPKERNEL_LIBRARY # MEDCOUPLING_LIBRARY # MEDLOADER_LIBRARY -# MEDTOOL_LIBRARIES -# MEDTOOL_PYTHON_DIRS +# MEDCOUPLING_LIBRARIES +# MEDCOUPLING_PYTHON_DIRS # -# The CMake (or environment) variable MEDTOOL_ROOT_DIR can be set to +# 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 MEDtool ...") +MESSAGE(STATUS "Check for MEDCoupling ...") -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) +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(MEDTOOL_INCLUDE_DIRS MEDCoupling.hxx) # mandatory +FIND_PATH(MEDCOUPLING_INCLUDE_DIRS MEDCoupling.hxx) # mandatory FIND_LIBRARY(INTERPKERNEL_LIBRARY NAMES interpkernel) # mandatory FIND_LIBRARY(MEDCOUPLING_REMAPPER_LIBRARY NAMES medcouplingremapper) # mandatory @@ -49,9 +49,9 @@ 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 +FIND_PATH(MEDCOUPLING_PYTHON_DIRS NAMES MEDCoupling.py MEDLoader.py PATH_SUFFIXES lib/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages) # optional -SET(MEDTOOL_LIBRARIES +SET(MEDCOUPLING_LIBRARIES ${INTERPKERNEL_LIBRARY} ${MEDCOUPLING_REMAPPER_LIBRARY} ${MEDCOUPLING_LIBRARY} @@ -61,4 +61,4 @@ SET(MEDTOOL_LIBRARIES ) INCLUDE(FindPackageHandleStandardArgs) -FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDtool REQUIRED_VARS MEDTOOL_INCLUDE_DIRS MEDTOOL_LIBRARIES) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDCoupling REQUIRED_VARS MEDCOUPLING_INCLUDE_DIRS MEDCOUPLING_LIBRARIES) diff --git a/src/MEDCalc/cmp/CMakeLists.txt b/src/MEDCalc/cmp/CMakeLists.txt index 7323cd6ed..108bf1751 100644 --- 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 2598c773a..7bcbefa3a 100644 --- 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 796afa74a..4fb862f20 100644 --- 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 79122cc9b..9f38b8f82 100644 --- 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 f8309ca01..b32c40f61 100644 --- 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 df1b1b637..6834ab4b0 100644 --- 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 99dd35cf9..8699f00c2 100644 --- 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 f19188f4e..169d2496b 100644 --- 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 1b82f0616..2bcdd9559 100644 --- 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 -- 2.39.2