X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=salome_adm%2Fcmake_files%2FFindSalomeMEDFile.cmake;h=c66e82011550dc2beaa21ea241604af36e18f1ba;hb=0af54d3a4092980402cbc548f277fd724f98863f;hp=f890f17a99429d5d748efaba587993aeceba9f6a;hpb=81a1755b449ad5a01c58673f6c132bebdafb963e;p=modules%2Fkernel.git diff --git a/salome_adm/cmake_files/FindSalomeMEDFile.cmake b/salome_adm/cmake_files/FindSalomeMEDFile.cmake index f890f17a9..c66e82011 100644 --- a/salome_adm/cmake_files/FindSalomeMEDFile.cmake +++ b/salome_adm/cmake_files/FindSalomeMEDFile.cmake @@ -1,9 +1,9 @@ -# Copyright (C) 2013 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2014 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. +# 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 @@ -19,10 +19,15 @@ # Author: Adrien Bruneton # -# Medfile detection dor Salome +# Medfile detection for Salome # # !! Please read the generic detection procedure in SalomeMacros.cmake !! # -SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_ROOT_DIR_EXP 0) +SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(MEDFile MEDFILE_INCLUDE_DIRS 1) #MARK_AS_ADVANCED() + +IF(MEDFILE_FOUND) + SALOME_ACCUMULATE_HEADERS(MEDFILE_INCLUDE_DIRS) + SALOME_ACCUMULATE_ENVIRONMENT(LD_LIBRARY_PATH ${MEDFILE_LIBRARIES}) +ENDIF() \ No newline at end of file