From: mnt Date: Mon, 21 Mar 2016 18:25:26 +0000 (+0300) Subject: Synchronize adm files X-Git-Tag: V7_8_0a2~8 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e5444f260a461bfe2ce542a794b0aea96677f3cd;p=tools%2Fmedcoupling.git Synchronize adm files --- diff --git a/cmake_files/FindCppUnit.cmake b/cmake_files/FindCppUnit.cmake index b47214b38..d5796b936 100644 --- a/cmake_files/FindCppUnit.cmake +++ b/cmake_files/FindCppUnit.cmake @@ -11,7 +11,7 @@ # ######################################################################### -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/cmake_files/FindGraphviz.cmake b/cmake_files/FindGraphviz.cmake index 35aada439..cc3de0deb 100644 --- a/cmake_files/FindGraphviz.cmake +++ b/cmake_files/FindGraphviz.cmake @@ -8,7 +8,7 @@ # GRAPHVIZ_FOUND - True if Graphviz was found. # ########################################################################### -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/cmake_files/FindMEDFile.cmake b/cmake_files/FindMEDFile.cmake index 82b8eee53..b081264ee 100644 --- a/cmake_files/FindMEDFile.cmake +++ b/cmake_files/FindMEDFile.cmake @@ -10,7 +10,7 @@ # guide the detection and indicate a root directory to look into. # ############################################################################ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 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 diff --git a/cmake_files/FindSalomeBoost.cmake b/cmake_files/FindSalomeBoost.cmake index 8bb1e96ec..82a1dce94 100644 --- a/cmake_files/FindSalomeBoost.cmake +++ b/cmake_files/FindSalomeBoost.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeCppUnit.cmake b/cmake_files/FindSalomeCppUnit.cmake index eefa38017..1b6283a6c 100644 --- a/cmake_files/FindSalomeCppUnit.cmake +++ b/cmake_files/FindSalomeCppUnit.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeDoxygen.cmake b/cmake_files/FindSalomeDoxygen.cmake index ea62ad593..53ce831ac 100644 --- a/cmake_files/FindSalomeDoxygen.cmake +++ b/cmake_files/FindSalomeDoxygen.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeGraphviz.cmake b/cmake_files/FindSalomeGraphviz.cmake index f41b1eae9..157c24fb7 100644 --- a/cmake_files/FindSalomeGraphviz.cmake +++ b/cmake_files/FindSalomeGraphviz.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeHDF5.cmake b/cmake_files/FindSalomeHDF5.cmake index 9f4671030..22ed25b21 100644 --- a/cmake_files/FindSalomeHDF5.cmake +++ b/cmake_files/FindSalomeHDF5.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeLibXml2.cmake b/cmake_files/FindSalomeLibXml2.cmake index 0f5048739..515032f1c 100644 --- a/cmake_files/FindSalomeLibXml2.cmake +++ b/cmake_files/FindSalomeLibXml2.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeMEDFile.cmake b/cmake_files/FindSalomeMEDFile.cmake index 8ac63af85..a5c411786 100644 --- a/cmake_files/FindSalomeMEDFile.cmake +++ b/cmake_files/FindSalomeMEDFile.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeMPI.cmake b/cmake_files/FindSalomeMPI.cmake index d9e6ec1c5..7395e4e82 100644 --- a/cmake_files/FindSalomeMPI.cmake +++ b/cmake_files/FindSalomeMPI.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeNumPySciPy.cmake b/cmake_files/FindSalomeNumPySciPy.cmake index f88a20bec..34d662406 100644 --- a/cmake_files/FindSalomeNumPySciPy.cmake +++ b/cmake_files/FindSalomeNumPySciPy.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomePythonInterp.cmake b/cmake_files/FindSalomePythonInterp.cmake index ef1a8d7d2..23f229d23 100644 --- a/cmake_files/FindSalomePythonInterp.cmake +++ b/cmake_files/FindSalomePythonInterp.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomePythonLibs.cmake b/cmake_files/FindSalomePythonLibs.cmake index 427786ed9..06e87aae5 100644 --- a/cmake_files/FindSalomePythonLibs.cmake +++ b/cmake_files/FindSalomePythonLibs.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 @@ -31,6 +31,10 @@ IF(EXISTS "${PYTHON_ROOT_DIR}" AND (NOT PYTHONLIBS_ROOT_DIR)) MESSAGE(STATUS "Setting PYTHONLIBS_ROOT_DIR to: ${PYTHON_ROOT_DIR}") SET(PYTHONLIBS_ROOT_DIR "${PYTHON_ROOT_DIR}" CACHE PATH "Path to PythonLibs directory") ENDIF() +IF (SALOMEPYTHONINTERP_FOUND AND NOT "${PYTHON_VERSION_STRING}" STREQUAL "") + # Trying to search libraries with same version as an interpreter version + SET(PythonLibs_FIND_VERSION ${PYTHON_VERSION_STRING}) +ENDIF() SALOME_FIND_PACKAGE_AND_DETECT_CONFLICTS(PythonLibs PYTHON_INCLUDE_DIR 2) IF(SALOMEPYTHONLIBS_FOUND) diff --git a/cmake_files/FindSalomeSWIG.cmake b/cmake_files/FindSalomeSWIG.cmake index 74c5c4ed3..dac53f3cd 100644 --- a/cmake_files/FindSalomeSWIG.cmake +++ b/cmake_files/FindSalomeSWIG.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSalomeSphinx.cmake b/cmake_files/FindSalomeSphinx.cmake index 03e6be024..31e9a609e 100644 --- a/cmake_files/FindSalomeSphinx.cmake +++ b/cmake_files/FindSalomeSphinx.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-2016 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 diff --git a/cmake_files/FindSphinx.cmake b/cmake_files/FindSphinx.cmake index 7c9b0bfe5..26aa3f0b5 100644 --- a/cmake_files/FindSphinx.cmake +++ b/cmake_files/FindSphinx.cmake @@ -5,7 +5,7 @@ # SPHINX_PYTHONPATH - path to the Sphinx Python modules # ########################################################################### -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE # # Copyright (C) 2003-2007 OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN, # CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS diff --git a/cmake_files/SalomeMacros.cmake b/cmake_files/SalomeMacros.cmake index cae6cbaba..5a94723fb 100644 --- a/cmake_files/SalomeMacros.cmake +++ b/cmake_files/SalomeMacros.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-2016 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 diff --git a/cmake_files/SalomeSetupPlatform.cmake b/cmake_files/SalomeSetupPlatform.cmake index a7bed3741..0dd0d2bcd 100644 --- a/cmake_files/SalomeSetupPlatform.cmake +++ b/cmake_files/SalomeSetupPlatform.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2015 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2016 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