Merge branch V7_3_1_BR

diff --git a/ATOMSOLV_version.h.in b/ATOMSOLV_version.h.in
index 0172a9648dbc48b8a3fb88eedfc60600c12ff881..bd7d91a847c38d88725183ae69d42cf3a33110cf 100644 (file)
--- a/ATOMSOLV_version.h.in
+++ b/ATOMSOLV_version.h.in
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 7c2366066582c6805e124ae1b90ccfcd52c9712f..2a15a285f5cda9735ef6699c0a5142fa3653be22 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -32,7 +32,7 @@ SET(${PROJECT_NAME_UC}_MINOR_VERSION 3)
 SET(${PROJECT_NAME_UC}_PATCH_VERSION 1)
 SET(${PROJECT_NAME_UC}_VERSION
   ${${PROJECT_NAME_UC}_MAJOR_VERSION}.${${PROJECT_NAME_UC}_MINOR_VERSION}.${${PROJECT_NAME_UC}_PATCH_VERSION})
-SET(${PROJECT_NAME_UC}_VERSION_DEV 0)
+SET(${PROJECT_NAME_UC}_VERSION_DEV 1)
 
 # Find KERNEL
 # ===========
@@ -41,14 +41,11 @@ IF(EXISTS ${KERNEL_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${KERNEL_ROOT_DIR}/salome_adm/cmake_files")
   INCLUDE(SalomeMacros)
   FIND_PACKAGE(SalomeKERNEL REQUIRED)
+  KERNEL_WITH_CORBA() # check whether KERNEL builded with CORBA 
 ELSE(EXISTS ${KERNEL_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome KERNEL, please define KERNEL_ROOT_DIR")
 ENDIF(EXISTS ${KERNEL_ROOT_DIR})
 
-IF(SALOME_LIGHT_ONLY)
-  MESSAGE(FATAL_ERROR "ATOMGEN module can't be built in Light mode (whiout CORBA)")
-ENDIF()
-
 # Platform setup
 # ==============
 INCLUDE(SalomeSetupPlatform)   # From KERNEL
@@ -81,6 +78,7 @@ SET(GUI_ROOT_DIR $ENV{GUI_ROOT_DIR} CACHE PATH "Path to the Salome GUI")
 IF(EXISTS ${GUI_ROOT_DIR})
   LIST(APPEND CMAKE_MODULE_PATH "${GUI_ROOT_DIR}/adm_local/cmake_files")
   FIND_PACKAGE(SalomeGUI REQUIRED)
+  FULL_GUI(TRUE) # check whether GUI builded in full mode and with CORBA
 ELSE(EXISTS ${GUI_ROOT_DIR})
   MESSAGE(FATAL_ERROR "We absolutely need a Salome GUI, please define GUI_ROOT_DIR")
 ENDIF(EXISTS ${GUI_ROOT_DIR})

diff --git a/SalomeATOMSOLVConfig.cmake.in b/SalomeATOMSOLVConfig.cmake.in
index d8992d9d3835bc6e2db9e80e73c6c11cb3312aa8..fbe7fce3a5743fa6b5cf022de41c0c3e6ddf3550 100644 (file)
--- a/SalomeATOMSOLVConfig.cmake.in
+++ b/SalomeATOMSOLVConfig.cmake.in
@@ -1,32 +1,27 @@
-# - Config file for the @PROJECT_NAME@ package
-# It defines the following variables. 
-# Specific to the pacakge @PROJECT_NAME@ itself:
-#  @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
+# Copyright (C) 2013-2014  CEA/DEN, EDF R&D, OPEN CASCADE
 #
-
-###############################################################
-#  Copyright (C) 2007-2013  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
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License, or (at your option) any later version.
 #
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
 #
-#  This library is free software; you can redistribute it and/or
-#  modify it under the terms of the GNU Lesser General Public
-#  License as published by the Free Software Foundation; either
-#  version 2.1 of the License.
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-#  This library is distributed in the hope that it will be useful,
-#  but WITHOUT ANY WARRANTY; without even the implied warranty of
-#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-#  Lesser General Public License for more details.
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#  You should have received a copy of the GNU Lesser General Public
-#  License along with this library; if not, write to the Free Software
-#  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+
+# - Config file for the @PROJECT_NAME@ package
+# It defines the following variables. 
+# Specific to the pacakge @PROJECT_NAME@ itself:
+#  @PROJECT_NAME_UC@_ROOT_DIR_EXP - the root path of the installation providing this CMake file
 #
-#  See http://www.salome-platform.org/ or
-#  email : webmaster.salome@opencascade.com
-###############################################################
 
 ### Initialisation performed by CONFIGURE_PACKAGE_CONFIG_FILE:
 @PACKAGE_INIT@

diff --git a/adm_local/CMakeLists.txt b/adm_local/CMakeLists.txt
index 84d97c22e5014fa450423e11fb3931dd15cccf26..4d9fba8f0c5b4108bdbc249d3276df1551c9f9de 100755 (executable)
--- a/adm_local/CMakeLists.txt
+++ b/adm_local/CMakeLists.txt
@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2013  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
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/cmake_files/CMakeLists.txt b/adm_local/cmake_files/CMakeLists.txt
index dc3be8eb1277ce56933c5122a4f039be0b9b217f..34ebbd17088bc48a4f3ced6398b6a8eabfb3ddc6 100755 (executable)
--- a/adm_local/cmake_files/CMakeLists.txt
+++ b/adm_local/cmake_files/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/cmake_files/FindSalomeATOMSOLV.cmake b/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
index 2d765579d91435dc3fd40105b97feede58ff56bc..41d82d14141ace0c8523861e8f82ee829fec9b3c 100644 (file)
--- a/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
+++ b/adm_local/cmake_files/FindSalomeATOMSOLV.cmake
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,7 +16,6 @@
 #
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#
 
 IF(NOT SalomeATOMSOLV_FIND_QUIETLY)
   MESSAGE(STATUS "Looking for Salome ATOMSOLV ...")

diff --git a/adm_local/unix/CMakeLists.txt b/adm_local/unix/CMakeLists.txt
index 2f895ae4bc65192d67fe49837c7fbdaa8b7fd4a5..8b89ce14a23eb5dca70ec8b363f45b1de24281c3 100755 (executable)
--- a/adm_local/unix/CMakeLists.txt
+++ b/adm_local/unix/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/unix/config_files/CMakeLists.txt b/adm_local/unix/config_files/CMakeLists.txt
index 012bef01f790dbcfb9c746f330260b19c4730c29..2c082a69c9943feeb50378ca91bddae69b990021 100755 (executable)
--- a/adm_local/unix/config_files/CMakeLists.txt
+++ b/adm_local/unix/config_files/CMakeLists.txt
@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2013  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
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/adm_local/unix/config_files/check_ATOMSOLV.m4 b/adm_local/unix/config_files/check_ATOMSOLV.m4
index 74780073b8859e4af8b1738ddc4ef764de57ec20..ded8ca11f8403672862a4f65b059b1e35039f184 100755 (executable)
--- a/adm_local/unix/config_files/check_ATOMSOLV.m4
+++ b/adm_local/unix/config_files/check_ATOMSOLV.m4
@@ -1,9 +1,9 @@
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt
index ffdf7b4109bbf193023a39611946666cb6b1eb92..22497081beae11634be9d4464e1ea09114e9fa79 100755 (executable)
--- a/bin/CMakeLists.txt
+++ b/bin/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/bin/myrunSalome.py b/bin/myrunSalome.py
index f7271971cf4f1bd1966e63e7ccdf7b727b944e94..b2402fbc018fccf7840de0dbb126c44180e02d16 100755 (executable)
--- a/bin/myrunSalome.py
+++ b/bin/myrunSalome.py
@@ -1,11 +1,11 @@
 #!/usr/bin/env python
 
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/bin/runAppli.in b/bin/runAppli.in
index 163601f214c78fe27934f6d6a0d86d5122ad47a7..b2dd1203c609cd5dea512442a50dfd6013a27d9b 100755 (executable)
--- a/bin/runAppli.in
+++ b/bin/runAppli.in
@@ -1,11 +1,11 @@
 #!/bin/sh
 
-# Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2007-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/idl/ATOMSOLV.idl b/idl/ATOMSOLV.idl
index a77df043a4c093299f8c9154cb068b59b3d857d4..0e317c16800ebdfba01f7789a2436db310f9e41f 100644 (file)
--- a/idl/ATOMSOLV.idl
+++ b/idl/ATOMSOLV.idl
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/idl/CMakeLists.txt b/idl/CMakeLists.txt
index 297920f4dff658374d0dec46c55b1479191b096d..2d172c9de5604d0ecca6746e15d477e185963888 100644 (file)
--- a/idl/CMakeLists.txt
+++ b/idl/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/resources/ATOMSOLVCatalog.xml b/resources/ATOMSOLVCatalog.xml
index fedd0acf7a8d8b7514bf0fd989a918191d893a95..87d2d8a46c685d5f20cac5b5154f69513c325d4c 100644 (file)
--- a/resources/ATOMSOLVCatalog.xml
+++ b/resources/ATOMSOLVCatalog.xml
@@ -1,12 +1,12 @@
 <?xml version='1.0' encoding='us-ascii' ?>
 
 <!--
-  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2014  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
   License as published by the Free Software Foundation; either
-  version 2.1 of the License.
+  version 2.1 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
index 39b2c11b3edd88f49a9a3fc3257ebcd754a864c5..9508a75983ec2b175ca6cf7e881859aa100bcf98 100755 (executable)
--- a/resources/CMakeLists.txt
+++ b/resources/CMakeLists.txt
@@ -1,12 +1,9 @@
-# Copyright (C) 2007-2013  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
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 8898b810da3474b828c73a19682aa4d15d5db5d5..60dd2546ea3cb24cb67923424d4909d1dcfd69a4 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -1,10 +1,10 @@
 <!--
-  Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+  Copyright (C) 2007-2014  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
   License as published by the Free Software Foundation; either
-  version 2.1 of the License.
+  version 2.1 of the License, or (at your option) any later version.
 
   This library is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLV/ATOMSOLV.cxx b/src/ATOMSOLV/ATOMSOLV.cxx
index d2da3f53027995c1252901773c1f07b1f6daaafb..741e8f41fd405749618b218f680b7eff6278baf8 100755 (executable)
--- a/src/ATOMSOLV/ATOMSOLV.cxx
+++ b/src/ATOMSOLV/ATOMSOLV.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLV/ATOMSOLV.hxx b/src/ATOMSOLV/ATOMSOLV.hxx
index 04d1c465a249c622000586a33699e065c5e19962..ff7eb7b88728c314c10b6ba615f7ec84f60300f5 100644 (file)
--- a/src/ATOMSOLV/ATOMSOLV.hxx
+++ b/src/ATOMSOLV/ATOMSOLV.hxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLV/CMakeLists.txt b/src/ATOMSOLV/CMakeLists.txt
index 686033c84ce17ac8d836dc157f31b4cebbedcfc6..8261bc5a4793ec4f687a692bd493279b89552bd7 100755 (executable)
--- a/src/ATOMSOLV/CMakeLists.txt
+++ b/src/ATOMSOLV/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
index 37975b93d532bc2ad2f07529c4ce8bcb20b8d7c2..e08edf23fe9d07753a5f5afae0aea0451789811f 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI.h b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
index fcb3cee1bb5e72c02692c3383cf76e0420bdf1db..2ea6d80425f2082a0a1b5a0c66abcf94f709b73f 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
index a2cd427022a0afbc40ff780ef452d5d23b10b3b7..594408e8281fa3954b9e834203489c3a8fb4eb5a 100755 (executable)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_ATOMSOLVGUI.hxx
@@ -1,12 +1,9 @@
-// Copyright (C) 2007-2013  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
+// Copyright (C) 2013-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
index 6d3a6283e81df3edddef2c4d8bdf93dc00a3893c..c4ab739108a324d6903a1a1caf2910d9fd66882e 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
index f14242ff29ee509cd45696ae5bf5f63bb8479e70..dfe2f81ea93e27c1e0b514d37c5a567bb99cb4a7 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataModel.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
index 74c61d73e53fad9c7ea1e519b6ab001c2854c41f..68239d8c312d0e43adc7a9367fce0a5b7dc3b0ff 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
index 4ec0a168800b1524c015b4774aef41c8eb885ffb..15eb9070f71c9d2ff06b7d4252cc04188fc2f254 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_DataObject.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
index 44b39768faec934a7bd5a76044db0066175e082d..f7da151052eb491983eb094fe3e7bb32f3be1db8 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
index 41e7d8482718cd9572e488a8dccf984642bfba96..b20a36c1da3d758cb77ddfe28978f2ff1f4bdceb 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Displayer.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
index 76c421981fc0c7f9e6851fcf26791aa7e148be85..6e82e138df0a69b2c56324c19e222248111b5011 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
index a3d4de40eabe35fb51d6e86f2c24d835be21cd7b..37981b02078537576e1941ed9c114aedae189d5d 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_Selection.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
index 1dde0f9e1cd2afda851a97951d6d75d7621d1412..9f9a660b5626598c1a34a363a713115c0735a0b5 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.cxx
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
index d94af4ff54bb9d615d3da3ac8005665dba5d9256..fe3950479f82a6a6460ed2dbab29ceb3ac45fcaf 100644 (file)
--- a/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
+++ b/src/ATOMSOLVGUI/ATOMSOLVGUI_TransparencyDlg.h
@@ -1,9 +1,9 @@
-// Copyright (C) 2007-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+// Copyright (C) 2007-2014  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
 // License as published by the Free Software Foundation; either
-// version 2.1 of the License.
+// version 2.1 of the License, or (at your option) any later version.
 //
 // This library is distributed in the hope that it will be useful,
 // but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/ATOMSOLVGUI/CMakeLists.txt b/src/ATOMSOLVGUI/CMakeLists.txt
index fd4551719f52b030bf2f42b6cc57448e7c30e231..c1eb66fb64e62add8e017deff17cd27844993cb6 100644 (file)
--- a/src/ATOMSOLVGUI/CMakeLists.txt
+++ b/src/ATOMSOLVGUI/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 119c67c8547b93baf1529aa56cf4d3e6e268dab5..7dd544f66572b1ae5c7f20d2a467389dfe799f59 100755 (executable)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1,9 +1,9 @@
-# Copyright (C) 2012-2013  CEA/DEN, EDF R&D, OPEN CASCADE
+# Copyright (C) 2013-2014  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
 # License as published by the Free Software Foundation; either
-# version 2.1 of the License.
+# version 2.1 of the License, or (at your option) any later version.
 #
 # This library is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of