Merge multi-study removal branch.

[samples/hello.git] / HELLO_version.h.in

diff --git a/HELLO_version.h.in b/HELLO_version.h.in
index d4dbfdc7c32d8b06af2e258ab007fb95624570e3..cd7b23990159ffaec3665fc60ed29148df24596a 100644 (file)
--- a/HELLO_version.h.in
+++ b/HELLO_version.h.in
@@ -1,4 +1,4 @@
-// Copyright (C) 2007-2012  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
@@ -6,7 +6,7 @@
 // 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
@@ -27,12 +27,22 @@
 #if !defined(__HELLO_VERSION_H__)
 #define __HELLO_VERSION_H__
 
-/*
-  HELLO_VERSION is (major << 16) + (minor << 8) + patch.
+/*!
+  Specify version of SALOME HELLO module, as follows
+
+  HELLO_VERSION_MAJOR       : (integer) number identifying major version
+  HELLO_VERSION_MINOR       : (integer) number identifying minor version
+  HELLO_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+  HELLO_VERSION_STR         : (string)  complete version number "major.minor.maintenance"
+  HELLO_VERSION             : (hex)     complete version number (major << 16) + (minor << 8) + maintenance
+  HELLO_DEVELOPMENT         : (integer) indicates development version when set to 1
 */
 
-#define HELLO_VERSION_STR "@VERSION@"
-#define HELLO_VERSION     @XVERSION@
-#define HELLO_DEVELOPMENT @VERSION_DEV@
+#define HELLO_VERSION_MAJOR       @SALOMEHELLO_MAJOR_VERSION@
+#define HELLO_VERSION_MINOR       @SALOMEHELLO_MINOR_VERSION@
+#define HELLO_VERSION_MAINTENANCE @SALOMEHELLO_PATCH_VERSION@
+#define HELLO_VERSION_STR         "@SALOMEHELLO_VERSION@"
+#define HELLO_VERSION             @SALOMEHELLO_XVERSION@
+#define HELLO_DEVELOPMENT         @SALOMEHELLO_VERSION_DEV@
 
 #endif // __HELLO_VERSION_H__