Change to use patch version in the Windows installer

This changes the version in the Graphviz installer .exe produced by
CMake to use the patch version number instead of the build
date. Still, if the patch version is "$GRAPHVIZ_VERSION_DATE", the
patch version will be set to the build date. This conforms with how
the Linux packages are created.

This change affects the filename of the installer, the version
presented to the user in the installer GUI, the installation path and
the version presented by the running software.

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 792bd9405a6bffb0ef126c29ac493b2a82d86992..0918d085b0d22b9f133aedfc2278a788226fe037 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -187,7 +187,7 @@ if (DEFINED VERSION)
 endif()
 
 set(GRAPHVIZ_VERSION_STRING "${GRAPHVIZ_VERSION_MAJOR}.${GRAPHVIZ_VERSION_MINOR}.${GRAPHVIZ_VERSION_PATCH}")
-set(GRAPHVIZ_VERSION_FULL "${GRAPHVIZ_VERSION_MAJOR}.${GRAPHVIZ_VERSION_MINOR}.${GRAPHVIZ_VERSION_BUILD}")
+set(GRAPHVIZ_VERSION_FULL "${GRAPHVIZ_VERSION_MAJOR}.${GRAPHVIZ_VERSION_MINOR}.${GRAPHVIZ_VERSION_PATCH}")
 file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/builddate.h "#define BUILDDATE \"${GRAPHVIZ_VERSION_BUILD}\"")
 
 message(STATUS "Graphviz version: ${GRAPHVIZ_VERSION_FULL}")

diff --git a/cmake/package_info.cmake b/cmake/package_info.cmake
index c415ca2c8f5051e9fe8cdab408bdbf0737dd0696..a99dadf17df4059e0f78b2d56376d0de3caac0d5 100644 (file)
--- a/cmake/package_info.cmake
+++ b/cmake/package_info.cmake
@@ -1,7 +1,7 @@
 set(CPACK_PACKAGE_NAME                  ${PROJECT_NAME}                 )
 SET(CPACK_PACKAGE_VERSION_MAJOR         ${GRAPHVIZ_VERSION_MAJOR}       )
 SET(CPACK_PACKAGE_VERSION_MINOR         ${GRAPHVIZ_VERSION_MINOR}       )
-SET(CPACK_PACKAGE_VERSION_PATCH         ${GRAPHVIZ_VERSION_BUILD}       )
+SET(CPACK_PACKAGE_VERSION_PATCH         ${GRAPHVIZ_VERSION_PATCH}       )
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY   "Graph Visualization Tools"     )
 set(CPACK_PACKAGE_VENDOR                Graphviz                        )
 set(CPACK_PACKAGE_CONTACT               http://www.graphviz.org/        )