CMake: Update path and version variables for current build system

diff --git a/PARAVIS_version.h.in b/PARAVIS_version.h.in
index 9c9ba6e918c4361019c7ecec2434c15e96ce3ba8..5a511e85ef6018a97e2fe2092daf8f30cd9a4398 100644 (file)
--- a/PARAVIS_version.h.in
+++ b/PARAVIS_version.h.in
@@ -23,12 +23,22 @@
 #if !defined(__PARAVIS_VERSION_H__)
 #define __PARAVIS_VERSION_H__
 
-/*
-  PARAVIS_VERSION is (major << 16) + (minor << 8) + patch.
+/*!
+  Specify version of SALOME PARAVIS module, as follows
+
+  PARAVIS_VERSION_MAJOR       : (integer) number identifying major version
+  PARAVIS_VERSION_MINOR       : (integer) number identifying minor version
+  PARAVIS_VERSION_MAINTENANCE : (integer) number identifying maintenance version
+  PARAVIS_VERSION_STR         : (string)  complete version number "major.minor.maintenance"
+  PARAVIS_VERSION             : (hex)     complete version number (major << 16) + (minor << 8) + maintenance
+  PARAVIS_DEVELOPMENT         : (integer) indicates development version when set to 1
 */
 
-#define PARAVIS_VERSION_STR "@VERSION@"
-#define PARAVIS_VERSION     @XVERSION@
-#define PARAVIS_DEVELOPMENT @VERSION_DEV@
+#define PARAVIS_VERSION_MAJOR       @SALOMEPARAVIS_MAJOR_VERSION@
+#define PARAVIS_VERSION_MINOR       @SALOMEPARAVIS_MINOR_VERSION@
+#define PARAVIS_VERSION_MAINTENANCE @SALOMEPARAVIS_PATCH_VERSION@
+#define PARAVIS_VERSION_STR         "@SALOMEPARAVIS_VERSION@"
+#define PARAVIS_VERSION             @SALOMEPARAVIS_XVERSION@
+#define PARAVIS_DEVELOPMENT         @SALOMEPARAVIS_VERSION_DEV@
 
 #endif // __PARAVIS_VERSION_H__

diff --git a/bin/VERSION.in b/bin/VERSION.in
index b91222e2cfc37a459d1e837b4a9aa80e2401c09d..4ae7cd6b4bed4f7736747cd2b1bfd4b9ea1f3f6a 100755 (executable)
--- a/bin/VERSION.in
+++ b/bin/VERSION.in
@@ -1,3 +1,3 @@
-[SALOME PARAVIS] : @VERSION@
-[DEVELOPMENT]    : @VERSION_DEV@
+[SALOME PARAVIS] : @SALOMEPARAVIS_VERSION@
+[DEVELOPMENT]    : @SALOMEPARAVIS_VERSION_DEV@
 [DESCRIPTION]    : SALOME ParaVis (Paraview-based post-processing) module

diff --git a/doc/salome/gui/doxyfile.in b/doc/salome/gui/doxyfile.in
index 3e669d9a2995728899bff81b1689e3a538e6a92f..4b5ff4b784398cb612ca0a1ae81671d22412580f 100755 (executable)
--- a/doc/salome/gui/doxyfile.in
+++ b/doc/salome/gui/doxyfile.in
@@ -22,7 +22,7 @@
 #---------------------------------------------------------------------------
 # Project related configuration options
 #---------------------------------------------------------------------------
-PROJECT_NAME           = "ParaViS Module v.@VERSION@"
+PROJECT_NAME           = "ParaViS Module v.@SALOMEPARAVIS_VERSION@"
 PROJECT_NUMBER         = 
 OUTPUT_DIRECTORY       = PARAVIS
 CREATE_SUBDIRS         = NO
@@ -34,7 +34,7 @@ ABBREVIATE_BRIEF       =
 ALWAYS_DETAILED_SEC    = YES
 INLINE_INHERITED_MEMB  = YES
 FULL_PATH_NAMES        = YES
-STRIP_FROM_PATH        = @top_srcdir@ @top_builddir@
+STRIP_FROM_PATH        = @CMAKE_SOURCE_DIR@ @CMAKE_BINARY_DIR@
 STRIP_FROM_INC_PATH    = 
 SHORT_NAMES            = NO
 JAVADOC_AUTOBRIEF      = YES
@@ -94,9 +94,9 @@ WARN_LOGFILE           =
 #---------------------------------------------------------------------------
 # configuration options related to the input files
 #---------------------------------------------------------------------------
-INPUT                  = @top_srcdir@/src \
-                        @top_srcdir@/bin \
-                        @top_builddir@/bin
+INPUT                  = @CMAKE_SOURCE_DIR@/src \
+                        @CMAKE_SOURCE_DIR@/bin \
+                        @CMAKE_BINARY_DIR@/bin
 FILE_PATTERNS          = *.hxx *.cxx *.h *.c *.hh *.cc @DOXYGEN_PYTHON_EXTENSION@
 RECURSIVE              = YES
 EXCLUDE                = 
@@ -105,7 +105,7 @@ EXCLUDE_PATTERNS       =
 EXAMPLE_PATH           = 
 EXAMPLE_PATTERNS       = 
 EXAMPLE_RECURSIVE      = NO
-IMAGE_PATH             = @srcdir@/images
+IMAGE_PATH             = @CMAKE_CURRENT_SOURCE_DIR@/images
 INPUT_FILTER           = 
 FILTER_PATTERNS        = 
 FILTER_SOURCE_FILES    = YES
@@ -134,9 +134,9 @@ IGNORE_PREFIX          =
 GENERATE_HTML          = YES
 HTML_OUTPUT            = .
 HTML_FILE_EXTENSION    = .html
-HTML_HEADER            = @srcdir@/static/myheader.html
-HTML_FOOTER            = @srcdir@/static/footer.html
-HTML_STYLESHEET        = @srcdir@/static/doxygen.css
+HTML_HEADER            = @CMAKE_CURRENT_SOURCE_DIR@/static/myheader.html
+HTML_FOOTER            = @CMAKE_CURRENT_SOURCE_DIR@/static/footer.html
+HTML_STYLESHEET        = @CMAKE_CURRENT_SOURCE_DIR@/static/doxygen.css
 HTML_ALIGN_MEMBERS     = YES
 GENERATE_HTMLHELP      = NO
 CHM_FILE               = 

diff --git a/resources/PARAVISCatalog.xml.in b/resources/PARAVISCatalog.xml.in
index 4f9d5185aeeac47cc547c2bce0c0c2a0146d8cf3..170bbe05923eb23fe03d0857366ad355f3e4cb60 100644 (file)
--- a/resources/PARAVISCatalog.xml.in
+++ b/resources/PARAVISCatalog.xml.in
@@ -30,7 +30,7 @@
             <component-username>ParaView</component-username>
             <component-type>PARAVIS</component-type>
             <component-author>vsv</component-author>
-            <component-version>@VERSION@</component-version>
+            <component-version>@SALOMEPARAVIS_VERSION@</component-version>
             <component-comment>ParaView module</component-comment>
             <component-multistudy>1</component-multistudy>
             <component-impltype>1</component-impltype>

diff --git a/resources/SalomeApp.xml.in b/resources/SalomeApp.xml.in
index 96a187f9e54e4cd5970e254c5356b0822f58f0f8..bf04c2e3ef60b011e2e369c767349620b9bd87b0 100644 (file)
--- a/resources/SalomeApp.xml.in
+++ b/resources/SalomeApp.xml.in
@@ -24,7 +24,7 @@
     <!-- Major module parameters -->
     <parameter name="name" value="ParaViS"/>
     <parameter name="icon" value="pqAppIcon22.png"/>
-    <parameter name="version" value="@VERSION@"/>
+    <parameter name="version" value="@SALOMEPARAVIS_VERSION@"/>
     <parameter name="singleton" value="true"/>
     <!-- Lists all additional popup items separated by ':' -->
     <parameter name="popupitems" value="importmed"/>