From f746cb3aebf285f3e25f09ebdf6a94a6a815ce27 Mon Sep 17 00:00:00 2001 From: Anas Nashif Date: Sat, 6 Jan 2018 20:48:57 -0500 Subject: [PATCH] version: fix version handling without extra_version set Without extra_version, we had an extra - at the end of the version string. Signed-off-by: Anas Nashif --- cmake/version.cmake | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cmake/version.cmake b/cmake/version.cmake index 3b399a2aa86..994b16f01a7 100644 --- a/cmake/version.cmake +++ b/cmake/version.cmake @@ -42,5 +42,9 @@ unset(PATCH) set(KERNEL_VERSION_MAJOR ${PROJECT_VERSION_MAJOR}) set(KERNEL_VERSION_MINOR ${PROJECT_VERSION_MINOR}) set(KERNEL_PATCHLEVEL ${PROJECT_VERSION_PATCH}) +if(PROJECT_VERSION_EXTRA) set(KERNEL_VERSION_STRING "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}-${PROJECT_VERSION_EXTRA}\"") +else() +set(KERNEL_VERSION_STRING "\"${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}\"") +endif()