From: Mikko Johannes Koivunalho <mikko.koivunalho@iki.fi>
Date: Sat, 14 Sep 2019 16:59:53 +0000 (+0200)
Subject: Truncate PROJECT_VERSION to three components
X-Git-Tag: 0.13.0~5^2~3
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=604e6f3eb5b678a79ef8c47aa90e4464d0206814;p=check

Truncate PROJECT_VERSION to three components

For compatibility with the Autotools build which only
uses three parts: major, minor and patch.

CMake allows four components in version numbering:
major, minor, patch and tweak.

Signed-off-by: Mikko Johannes Koivunalho <mikko.koivunalho@iki.fi>
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dd4e925..7baa02d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -47,11 +47,7 @@ extract_version(configure.ac CHECK_MICRO_VERSION)
 set(PROJECT_VERSION_MAJOR ${CHECK_MAJOR_VERSION})
 set(PROJECT_VERSION_MINOR ${CHECK_MINOR_VERSION})
 set(PROJECT_VERSION_PATCH ${CHECK_MICRO_VERSION})
-set(PROJECT_VERSION_TWEAK 0)
-set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}.${PROJECT_VERSION_TWEAK}")
-
-set(check_VERSION
-  "${CHECK_MAJOR_VERSION}.${CHECK_MINOR_VERSION}.${CHECK_MICRO_VERSION}")
+set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
 
 set(MEMORY_LEAKING_TESTS_ENABLED 1)
 
@@ -494,7 +490,7 @@ configure_package_config_file(
 )
 write_basic_package_version_file(
   ${CMAKE_CURRENT_BINARY_DIR}/${EXPORT_NAME}-config-version.cmake
-  VERSION ${check_VERSION}
+  VERSION ${PROJECT_VERSION}
   COMPATIBILITY AnyNewerVersion
 )