From 73b99d15e8da344e335647984b63c24b6e25249b Mon Sep 17 00:00:00 2001 From: Dale Phurrough Date: Tue, 25 May 2021 23:17:46 +0200 Subject: [PATCH] fix cmake version var, missing ver patch - code used wrong variable name, was missing underscore - code did not allow version-patch, now defaults to 0 while also allowing it --- cmake/K4AProjectVersion.cmake | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/cmake/K4AProjectVersion.cmake b/cmake/K4AProjectVersion.cmake index 14099278f..b7e5ec638 100644 --- a/cmake/K4AProjectVersion.cmake +++ b/cmake/K4AProjectVersion.cmake @@ -12,7 +12,10 @@ endfunction() # Set the default version string if it wasn't defined in the build configuration if (NOT DEFINED VERSION_STR) - set(VERSION_STR "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.0-private") + if (NOT PROJECT_VERSION_PATCH) + set(PROJECT_VERSION_PATCH 0) + endif() + set(VERSION_STR "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-private") endif() set(SEMVER_REGEX "^([0-9]+)\\.([0-9]+)\\.([0-9]+)(\\-([a-zA-Z0-9\\._]+))?(\\+([a-zA-Z0-9\\._]+))?$") @@ -36,7 +39,7 @@ set(K4A_VERSION_MAJOR ${CMAKE_MATCH_1}) set(K4A_VERSION_MINOR ${CMAKE_MATCH_2}) set(K4A_VERSION_PATCH ${CMAKE_MATCH_3}) set(K4A_VERSION_PRERELEASE ${CMAKE_MATCH_5}) -set(K4A_VERSION_BUILDMETADATA ${CMAKE_MATCH_7}) +set(K4A_VERSION_BUILD_METADATA ${CMAKE_MATCH_7}) set(K4A_VERSION_STR ${VERSION_STR}) if (NOT K4A_VERSION_REVISION)