From 0bedccc00262b2eba8bd07a2be5ba0e1b8dcf2c8 Mon Sep 17 00:00:00 2001 From: mnt Date: Fri, 18 Mar 2016 23:11:18 +0300 Subject: [PATCH] Synchronize adm files --- CMakeModules/FindGraphviz.cmake | 2 +- CMakeModules/FindSalomeDoxygen.cmake | 2 +- CMakeModules/FindSalomeGraphviz.cmake | 2 +- CMakeModules/FindSalomePythonInterp.cmake | 2 +- CMakeModules/FindSalomePythonLibs.cmake | 6 +----- CMakeModules/FindSalomeSphinx.cmake | 2 +- CMakeModules/FindSphinx.cmake | 2 +- CMakeModules/SalomeMacros.cmake | 2 +- CMakeModules/SalomeSetupPlatform.cmake | 2 +- 9 files changed, 9 insertions(+), 13 deletions(-) diff --git a/CMakeModules/FindGraphviz.cmake b/CMakeModules/FindGraphviz.cmake index cc3de0d..35aada4 100644 --- a/CMakeModules/FindGraphviz.cmake +++ b/CMakeModules/FindGraphviz.cmake @@ -8,7 +8,7 @@ # GRAPHVIZ_FOUND - True if Graphviz was found. # ########################################################################### -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2015 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/CMakeModules/FindSalomeDoxygen.cmake b/CMakeModules/FindSalomeDoxygen.cmake index 53ce831..ea62ad5 100644 --- a/CMakeModules/FindSalomeDoxygen.cmake +++ b/CMakeModules/FindSalomeDoxygen.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-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 diff --git a/CMakeModules/FindSalomeGraphviz.cmake b/CMakeModules/FindSalomeGraphviz.cmake index 157c24f..f41b1ea 100644 --- a/CMakeModules/FindSalomeGraphviz.cmake +++ b/CMakeModules/FindSalomeGraphviz.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-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 diff --git a/CMakeModules/FindSalomePythonInterp.cmake b/CMakeModules/FindSalomePythonInterp.cmake index 23f229d..ef1a8d7 100644 --- a/CMakeModules/FindSalomePythonInterp.cmake +++ b/CMakeModules/FindSalomePythonInterp.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-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 diff --git a/CMakeModules/FindSalomePythonLibs.cmake b/CMakeModules/FindSalomePythonLibs.cmake index 06e87aa..427786e 100644 --- a/CMakeModules/FindSalomePythonLibs.cmake +++ b/CMakeModules/FindSalomePythonLibs.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-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 @@ -31,10 +31,6 @@ 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/CMakeModules/FindSalomeSphinx.cmake b/CMakeModules/FindSalomeSphinx.cmake index 31e9a60..03e6be0 100644 --- a/CMakeModules/FindSalomeSphinx.cmake +++ b/CMakeModules/FindSalomeSphinx.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2013-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 diff --git a/CMakeModules/FindSphinx.cmake b/CMakeModules/FindSphinx.cmake index 26aa3f0..7c9b0bf 100644 --- a/CMakeModules/FindSphinx.cmake +++ b/CMakeModules/FindSphinx.cmake @@ -5,7 +5,7 @@ # SPHINX_PYTHONPATH - path to the Sphinx Python modules # ########################################################################### -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-2015 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/CMakeModules/SalomeMacros.cmake b/CMakeModules/SalomeMacros.cmake index 5a94723..cae6cba 100644 --- a/CMakeModules/SalomeMacros.cmake +++ b/CMakeModules/SalomeMacros.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2012-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2012-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 diff --git a/CMakeModules/SalomeSetupPlatform.cmake b/CMakeModules/SalomeSetupPlatform.cmake index 0dd0d2b..a7bed37 100644 --- a/CMakeModules/SalomeSetupPlatform.cmake +++ b/CMakeModules/SalomeSetupPlatform.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2007-2016 CEA/DEN, EDF R&D, OPEN CASCADE +# Copyright (C) 2007-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 -- 2.39.2