commit be25936bb204c38c6366ab2cbc745020af78152d
author Anas Nashif <anas.nashif@intel.com> Sun Nov 19 22:42:19 2017 -0500
committer Anas Nashif <nashif@linux.intel.com> Sun Nov 19 23:16:03 2017 -0500
tree 6d1483e2f404bd8db519909b527fe116ab8bdfc1
parent 7f37d04d06c25691bdec872f19c8ac9d72fdce42

release: make cmake happy about version

Signed-off-by: Anas Nashif <anas.nashif@intel.com>

VERSION

diff --git a/VERSION b/VERSION
index 51a207e..11cb888 100644
--- a/VERSION
+++ b/VERSION
@@ -2,4 +2,4 @@
 VERSION_MINOR = 10
 PATCHLEVEL = 0
 VERSION_TWEAK = 0
-EXTRAVERSION = -rc1
+EXTRAVERSION = rc1

cmake/version.cmake

diff --git a/cmake/version.cmake b/cmake/version.cmake
index 7af35b7..3b399a2 100644
--- a/cmake/version.cmake
+++ b/cmake/version.cmake
@@ -13,7 +13,7 @@
 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 @@
 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}\"")