[Plplot-cvs] SF.net SVN: plplot:[13048] trunk

[<ai...@us...>]

Revision: 13048
          http://sourceforge.net/p/plplot/code/13048
Author:   airwin
Date:     2014-03-09 19:12:43 +0000 (Sun, 09 Mar 2014)
Log Message:
-----------
Improve PLplot version information for the installed headers.

Propagate PLPLOT_VERSION macro to the installed headers.

#define and propagate PLPLOT_VERSION_MAJOR, PLPLOT_VERSION_MINOR, and
PLPLOT_VERSION_PATCH to the installed headers.

Modified Paths:
--------------
    trunk/cmake/modules/plplot_version.cmake
    trunk/include/plConfig.h.in
    trunk/plplot_config.h.in

Modified: trunk/cmake/modules/plplot_version.cmake
===================================================================
--- trunk/cmake/modules/plplot_version.cmake	2014-03-09 18:54:17 UTC (rev 13047)
+++ trunk/cmake/modules/plplot_version.cmake	2014-03-09 19:12:43 UTC (rev 13048)
@@ -4,13 +4,17 @@
 
 # Version data that need review and possible modification for each release.
 
+set(PLPLOT_VERSION_MAJOR 5)
+set(PLPLOT_VERSION_MINOR 10)
+set(PLPLOT_VERSION_PATCH 0)
+
 # Overall PLplot version number.
-set(PLPLOT_VERSION 5.10.0)
+set(PLPLOT_VERSION ${PLPLOT_VERSION_MAJOR}.${PLPLOT_VERSION_MINOR}.${PLPLOT_VERSION_PATCH})
 
 # CPack version numbers for release tarball name.
-set(CPACK_PACKAGE_VERSION_MAJOR 5)
-set(CPACK_PACKAGE_VERSION_MINOR 10)
-set(CPACK_PACKAGE_VERSION_PATCH 0)
+set(CPACK_PACKAGE_VERSION_MAJOR ${PLPLOT_VERSION_MAJOR})
+set(CPACK_PACKAGE_VERSION_MINOR ${PLPLOT_VERSION_MINOR})
+set(CPACK_PACKAGE_VERSION_PATCH ${PLPLOT_VERSION_PATCH})
 
 # PLplot library version information.
 

Modified: trunk/include/plConfig.h.in
===================================================================
--- trunk/include/plConfig.h.in	2014-03-09 18:54:17 UTC (rev 13047)
+++ trunk/include/plConfig.h.in	2014-03-09 19:12:43 UTC (rev 13048)
@@ -47,6 +47,12 @@
 #  include <plplot_config.h>
 #endif
 
+// PLplot version information.
+#define PLPLOT_VERSION_MAJOR    "@PLPLOT_VERSION_MAJOR@"
+#define PLPLOT_VERSION_MINOR    "@PLPLOT_VERSION_MINOR@"
+#define PLPLOT_VERSION_PATCH    "@PLPLOT_VERSION_PATCH@"
+#define PLPLOT_VERSION          "@PLPLOT_VERSION@"
+
 // Define if you have c++ accessible stdint.h
 #cmakedefine PL_HAVE_CXX_STDINT_H
 

Modified: trunk/plplot_config.h.in
===================================================================
--- trunk/plplot_config.h.in	2014-03-09 18:54:17 UTC (rev 13047)
+++ trunk/plplot_config.h.in	2014-03-09 19:12:43 UTC (rev 13048)
@@ -282,9 +282,6 @@
 // Define to 1 if you have the ANSI C header files.
 #cmakedefine STDC_HEADERS 1
 
-// Overall PLplot version number
-#define PLPLOT_VERSION             "@PLPLOT_VERSION@"
-
 // Location of Tcl stuff
 #define TCL_DIR                    "@TCL_DIR@"
 // Consistent package versions for Itcl and friends found by PLplot

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.