Synchronize adm files

diff --git a/cmake_files/FindCppUnit.cmake b/cmake_files/FindCppUnit.cmake
index b47214b389957913454469a7212c31ba71466a4d..d5796b936df774d0621f37220ae85fde28c44e6d 100644 (file)
--- 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 35aada43904dbc1ecfb1953cc12faf6d23d9b97a..cc3de0deb3aed564da6c1459963f17d5087d6281 100644 (file)
--- 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 82b8eee53d6207214a8cecd224e7e34a10821663..b081264eee604e7ffe4b4e7958d8854725f9ed36 100644 (file)
--- 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 8bb1e96ec0e1fea6b59373368cd707216131dc67..82a1dce94d6134138b2f1c00777916e2ed196347 100644 (file)
--- 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 eefa38017094621abc365e0d794eb8e781daed15..1b6283a6c6235bcd5d7ee25b06d49ed70d0d65d9 100644 (file)
--- 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 ea62ad593c9f25d22912a5b41f19fba3c2a533cc..53ce831ac8e3c8d3ceb483f44cd08421f77a0c23 100644 (file)
--- 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 f41b1eae9f424f2cb1e82e230fa5620861e470b4..157c24fb70b171a61f30559797958c1ce0f2cfe8 100644 (file)
--- 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 9f467103050dc2d6edcbe3d147dc366b2db48495..22ed25b213fd2aa95866861f190bf801284ff63b 100644 (file)
--- 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 0f50487391e3daa8a6acdb0bb00aa7f732d96ca2..515032f1c1d52bb546b09916d62a1402d91a5810 100644 (file)
--- 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 8ac63af855cd0d865c18dac19fc5d490eaf93657..a5c4117868d208656e18059bbe87cd7cd150ec89 100644 (file)
--- 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 d9e6ec1c56f7782a3e4fb380024a96c4f3586e10..7395e4e82e89f7e7383ee6b07bdd97bf49476956 100644 (file)
--- 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 f88a20bec9d2c99a2b5b1ed7ce51c2923440d8c9..34d662406fb1d822b9c5ba72c6aa431a8c882499 100644 (file)
--- 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 ef1a8d7d22d06b35eb11e3cfdabbe0757232c656..23f229d23738db7ab5250ff673f21504a861da2b 100644 (file)
--- 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 427786ed9789973f3581aa3b32be7fb1134fe070..06e87aae5a94304f5393bae0cb9ab604c95618c6 100644 (file)
--- 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 74c5c4ed3214c3f2f97a3f121f726950da30ad6a..dac53f3cd0c8d2104113f85d21185cb38da7040e 100644 (file)
--- 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 03e6be0241cdacd2bde201b6aa1406bc110c7ee6..31e9a609ee4770f2d35b123345e2e2c1c806d376 100644 (file)
--- 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 7c9b0bfe5e17d83c86e8f208a64da1056681f89a..26aa3f0b56cac1786d58eebebfb964b39e5a3cb3 100644 (file)
--- 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 cae6cbaba793e9ad3bc88a56d88f69fc126532f6..5a94723fb09407b4eb355b90d8aff80dc6baac32 100644 (file)
--- 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 a7bed3741f4bbb076897316940d3c23471c927c1..0dd0d2bcdbae34bd3ee3249b3e26b022e7931d5c 100644 (file)
--- 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