Synchronize adm files

diff --git a/CMakeModules/FindGraphviz.cmake b/CMakeModules/FindGraphviz.cmake
index cc3de0deb3aed564da6c1459963f17d5087d6281..35aada43904dbc1ecfb1953cc12faf6d23d9b97a 100644 (file)
--- 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 53ce831ac8e3c8d3ceb483f44cd08421f77a0c23..ea62ad593c9f25d22912a5b41f19fba3c2a533cc 100644 (file)
--- 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 157c24fb70b171a61f30559797958c1ce0f2cfe8..f41b1eae9f424f2cb1e82e230fa5620861e470b4 100644 (file)
--- 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 23f229d23738db7ab5250ff673f21504a861da2b..ef1a8d7d22d06b35eb11e3cfdabbe0757232c656 100644 (file)
--- 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 06e87aae5a94304f5393bae0cb9ab604c95618c6..427786ed9789973f3581aa3b32be7fb1134fe070 100644 (file)
--- 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 31e9a609ee4770f2d35b123345e2e2c1c806d376..03e6be0241cdacd2bde201b6aa1406bc110c7ee6 100644 (file)
--- 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 26aa3f0b56cac1786d58eebebfb964b39e5a3cb3..7c9b0bfe5e17d83c86e8f208a64da1056681f89a 100644 (file)
--- 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 5a94723fb09407b4eb355b90d8aff80dc6baac32..cae6cbaba793e9ad3bc88a56d88f69fc126532f6 100644 (file)
--- 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 0dd0d2bcdbae34bd3ee3249b3e26b022e7931d5c..a7bed3741f4bbb076897316940d3c23471c927c1 100644 (file)
--- 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