From: vsr Date: Thu, 24 Mar 2016 10:17:35 +0000 (+0300) Subject: Merge branch 'V7_dev' X-Git-Tag: V8_1_0a1~20 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=e429ce02076e083051c6520e0d7113022bd67b18;p=modules%2Fkernel.git Merge branch 'V7_dev' --- e429ce02076e083051c6520e0d7113022bd67b18 diff --cc CTestTestfileInstall.cmake.in index 9282d0a28,4136a32bc..254fb82f1 --- a/CTestTestfileInstall.cmake.in +++ b/CTestTestfileInstall.cmake.in @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake index bdf4b90b1,59600aded..5c90495c8 --- a/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake +++ b/bin/appliskel/tests/concurrentSession/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake index 3c5391727,f38992b78..eb69a0d20 --- a/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake +++ b/bin/appliskel/tests/salomeCommand/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake index 366f022db,9e5b9d257..c8cbb1e24 --- a/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake +++ b/bin/appliskel/tests/salomeInstance/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc salome_adm/cmake_files/CMakeLists.txt index ed3f36a3d,f6114021a..9411a537a --- a/salome_adm/cmake_files/CMakeLists.txt +++ b/salome_adm/cmake_files/CMakeLists.txt @@@ -45,7 -45,10 +45,9 @@@ SET(DAT FindSalomeOmniORB.cmake FindSalomeOmniORBPy.cmake FindSalomePThread.cmake - FindSalomePython.cmake -# FindSalomePython.cmake + FindSalomePythonLibs.cmake + FindSalomePythonInterp.cmake + FindSalomeNumPySciPy.cmake FindSalomeSphinx.cmake FindSalomeSWIG.cmake FindSphinx.cmake diff --cc src/KernelHelpers/Test/CTestTestfileInstall.cmake index 9ba6010ee,183b9f343..eac9713a3 --- a/src/KernelHelpers/Test/CTestTestfileInstall.cmake +++ b/src/KernelHelpers/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/Launcher/Test/CTestTestfileInstall.cmake index e3db2b18b,76cc5b159..664c74c99 --- a/src/Launcher/Test/CTestTestfileInstall.cmake +++ b/src/Launcher/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake index 85a2fd7eb,606a7a1e2..21f3217c0 --- a/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake +++ b/src/LifeCycleCORBA/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake index 1e7257473,76cc5b159..ae7164a4e --- a/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake +++ b/src/LifeCycleCORBA_SWIG/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/NamingService/Test/CTestTestfileInstall.cmake index 7ffe57fea,35c2060cb..c72dfabf1 --- a/src/NamingService/Test/CTestTestfileInstall.cmake +++ b/src/NamingService/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/SALOMEDS/Test/CTestTestfileInstall.cmake index 0b249dfe7,bb4a3b00c..941b3e081 --- a/src/SALOMEDS/Test/CTestTestfileInstall.cmake +++ b/src/SALOMEDS/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake index 11c94b898,198615726..231c53fe2 --- a/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake +++ b/src/SALOMEDSImpl/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake index 074b9b881,160b61620..a8397a875 --- a/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake +++ b/src/SALOMELocalTrace/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/SALOMESDS/CTestTestfileInstall.cmake index ee7dc3714,491de34ed..555b36aca --- a/src/SALOMESDS/CTestTestfileInstall.cmake +++ b/src/SALOMESDS/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake index 7ee19bca3,7c3c591bc..4a58cb209 --- a/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake +++ b/src/SALOMETraceCollector/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/UnitTests/CTestTestfileInstall.cmake index 3674efa58,d4813863d..a9747536b --- a/src/UnitTests/CTestTestfileInstall.cmake +++ b/src/UnitTests/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public diff --cc src/Utils/Test/CTestTestfileInstall.cmake index 7027a5451,c33e109d5..b6301285d --- a/src/Utils/Test/CTestTestfileInstall.cmake +++ b/src/Utils/Test/CTestTestfileInstall.cmake @@@ -1,4 -1,4 +1,4 @@@ - # Copyright (C) 2015, 2016 CEA/DEN, EDF R&D -# Copyright (C) 2015-2016 CEA/DEN, EDF R&D, OPEN CASCADE ++# Copyright (C) 2015-2016 CEA/DEN, EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public