From 00b06de2272065d43666c6d329abc875b0e48e14 Mon Sep 17 00:00:00 2001 From: ageay Date: Mon, 8 Jul 2013 13:51:30 +0000 Subject: [PATCH] MEDFile detection --- CMakeLists.txt | 4 +- .../cmake_files/FindMEDFile.cmake | 42 +++++++++++++++++++ ...eMedfile.cmake => FindSalomeMEDFile.cmake} | 4 +- 3 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 adm_local_without_kernel/cmake_files/FindMEDFile.cmake rename adm_local_without_kernel/cmake_files/{FindSalomeMedfile.cmake => FindSalomeMEDFile.cmake} (92%) diff --git a/CMakeLists.txt b/CMakeLists.txt index a4b0f7442..dd1b65d7c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -81,7 +81,7 @@ ENDIF(NOT SALOME_MED_STANDALONE) IF(NOT SALOME_MED_MICROMED) FIND_PACKAGE(SalomeHDF5 REQUIRED) - FIND_PACKAGE(SalomeMedfile REQUIRED) + FIND_PACKAGE(SalomeMEDFile REQUIRED) ENDIF(NOT SALOME_MED_MICROMED) IF(SALOME_BUILD_GUI) @@ -121,7 +121,7 @@ IF(SALOME_MED_ENABLE_PYTHON) ENDIF(SALOME_MED_ENABLE_PYTHON) IF(NOT SALOME_MED_MICROMED) - FIND_PACKAGE(SalomeMedfile REQUIRED) + FIND_PACKAGE(SalomeMEDFile REQUIRED) ENDIF(NOT SALOME_MED_MICROMED) diff --git a/adm_local_without_kernel/cmake_files/FindMEDFile.cmake b/adm_local_without_kernel/cmake_files/FindMEDFile.cmake new file mode 100644 index 000000000..5ee40e16f --- /dev/null +++ b/adm_local_without_kernel/cmake_files/FindMEDFile.cmake @@ -0,0 +1,42 @@ +# Copyright (C) 2007-2013 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. +# +# 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 +# + +# ------ + +MESSAGE(STATUS "Check for medfile ...") + +# ------ + +SET(MEDFILE_ROOT_DIR $ENV{MEDFILE_ROOT_DIR} CACHE PATH "Path to the MEDFile.") +IF(MEDFILE_ROOT_DIR) + LIST(APPEND CMAKE_PREFIX_PATH "${CPPUNIT_ROOT_DIR}") +ENDIF(MEDFILE_ROOT_DIR) + +FIND_PATH(MEDFILE_INCLUDE_DIRS med.h) +#FIND_PROGRAM(MDUMP mdump) +FIND_LIBRARY(MEDFILE_C_LIBRARIES libmedC.so medC) +FIND_LIBRARY(MEDFILE_F_LIBRARIES libmed.so med) +IF(MEDFILE_F_LIBRARIES) + SET(MEDFILE_LIBRARIES ${MEDFILE_C_LIBRARIES} ${MEDFILE_F_LIBRARIES}) +ELSE(MEDFILE_F_LIBRARIES) + SET(MEDFILE_LIBRARIES ${MEDFILE_C_LIBRARIES}) +ENDIF(MEDFILE_F_LIBRARIES) + +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MEDFile REQUIRED_VARS MEDFILE_INCLUDE_DIRS MEDFILE_LIBRARIES) diff --git a/adm_local_without_kernel/cmake_files/FindSalomeMedfile.cmake b/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake similarity index 92% rename from adm_local_without_kernel/cmake_files/FindSalomeMedfile.cmake rename to adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake index 10e45a635..f890f17a9 100644 --- a/adm_local_without_kernel/cmake_files/FindSalomeMedfile.cmake +++ b/adm_local_without_kernel/cmake_files/FindSalomeMEDFile.cmake @@ -24,5 +24,5 @@ # !! Please read the generic detection procedure in SalomeMacros.cmake !! # -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(medfile MEDFILE_ROOT_DIR_EXP 0) -#MARK_AS_ADVANCED() \ No newline at end of file +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_ROOT_DIR_EXP 0) +#MARK_AS_ADVANCED() -- 2.39.2