gnucash unstable: Multiple changes pushed

[John Ralls]

Updated	 via  https://github.com/Gnucash/gnucash/commit/ba3bf37d (commit)
	 via  https://github.com/Gnucash/gnucash/commit/cf24f983 (commit)
	from  https://github.com/Gnucash/gnucash/commit/7a0f0d57 (commit)



commit ba3bf37d93514a1ad254144cf3cb7fe4fb6b584a
Merge: 7a0f0d5 cf24f98
Author: John Ralls <jralls at ceridwen.us>
Date:   Mon Apr 9 12:22:05 2018 -0700

    Merge DiMan's GNUCASH_MICRO_VERSION fix into unstable.


commit cf24f9830bb81392d445e689d67c74a21e026422
Author: Di Mang <DiMan at users.noreply.github.com>
Date:   Wed Apr 4 23:11:13 2018 +0200

    Remove GNUCASH_MICRO_VERSION from VERSION...
    
    and remove of variable CPACK_PACKAGE_VERSION_PATCH

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2c77e39..1624245 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -13,7 +13,7 @@ ENABLE_TESTING()
 # Version number of gnucash
 SET (GNUCASH_MAJOR_VERSION 3)
 SET (GNUCASH_MINOR_VERSION 0)
-SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}.${GNUCASH_MICRO_VERSION}")
+SET (VERSION "${GNUCASH_MAJOR_VERSION}.${GNUCASH_MINOR_VERSION}")
 SET (GNUCASH_LATEST_STABLE_SERIES 3.0)
 
 SET (PACKAGE gnucash)
@@ -926,7 +926,6 @@ ENDIF()
 
 SET(CPACK_PACKAGE_VERSION_MAJOR "${GNUCASH_MAJOR_VERSION}")
 SET(CPACK_PACKAGE_VERSION_MINOR "${GNUCASH_MINOR_VERSION}")
-SET(CPACK_PACKAGE_VERSION_PATCH "${GNUCASH_MICRO_VERSION}")
 SET(CPACK_PACKAGE_VERSION "${VERSION}")
 
 IF(UNIX)



Summary of changes:
 CMakeLists.txt | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)