Merge branch 'master' into V7_5_BR

[modules/kernel.git] / salome_adm / cmake_files / deprecated / am2cmake.py

diff --git a/salome_adm/cmake_files/deprecated/am2cmake.py b/salome_adm/cmake_files/deprecated/am2cmake.py
index dcc4a7411d3d2cb53781a7d5e1e59e2b20ce981e..2a220ef62d1b1c1342ff2887e9f77b16e33d2ca8 100644 (file)
--- a/salome_adm/cmake_files/deprecated/am2cmake.py
+++ b/salome_adm/cmake_files/deprecated/am2cmake.py
@@ -1,10 +1,10 @@
 #  -*- coding: iso-8859-1 -*-
-# 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
@@ -816,9 +816,9 @@ class CMakeFile(object):
                 pass
             # --
             newlines.append("""
-            set(VERSION 7.2.0)
-            set(SHORT_VERSION 7.2)
-            set(XVERSION 0x070200)
+            set(VERSION 7.5.0)
+            set(SHORT_VERSION 7.5)
+            set(XVERSION 0x070500)
             set(VERSION_DEV 0)
             """)
             pass