michaelh/zephyr
1
0
Fork 0
Code Releases Activity

release: make cmake happy about version

Browse source 
Signed-off-by: Anas Nashif <anas.nashif@intel.com>
This commit is contained in:
Anas Nashif 2017-11-19 22:42:19 -05:00 • committed by Anas Nashif
commit be25936bb2
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
VERSION
View file

@ -2,4 +2,4 @@ VERSION_MAJOR = 1
VERSION_MINOR = 10
PATCHLEVEL = 0
VERSION_TWEAK = 0
EXTRAVERSION = -rc1
EXTRAVERSION = rc1

4
cmake/version.cmake
View file

@ -13,7 +13,7 @@ set(PROJECT_VERSION_PATCH ${CMAKE_MATCH_1})
string(REGEX MATCH "VERSION_TWEAK = ([0-9]*)" _ ${ver})
set(PROJECT_VERSION_TWEAK ${CMAKE_MATCH_1})
string(REGEX MATCH "EXTRAVERSION = (.*)" _ ${ver})
string(REGEX MATCH "EXTRAVERSION = ([a-z0-9]*)" _ ${ver})
set(PROJECT_VERSION_EXTRA ${CMAKE_MATCH_1})
@ -42,5 +42,5 @@ unset(PATCH)
set(KERNEL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR})
set(KERNEL_VERSION_MINOR ${PROJECT_VERSION_MINOR})
set(KERNEL_PATCHLEVEL ${PROJECT_VERSION_PATCH})
set(KERNEL_VERSION_STRING "\"${PROJECT_VERSION}\"")
set(KERNEL_VERSION_STRING "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${PROJECT_VERSION_EXTRA}\"")