Merge pull request y-256#7 from kloetzl/master

Fixed y-256#5: strips whitespace from version string
kurpicz · Oct 27, 2015 · 5f60d6f · 5f60d6f
2 parents 735637c + 522cac8
commit 5f60d6f
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/VERSION.cmake b/VERSION.cmake
@@ -1,8 +1,9 @@
 set(PROJECT_VERSION_MAJOR "2")
 set(PROJECT_VERSION_MINOR "0")
 set(PROJECT_VERSION_PATCH "2")
+set(PROJECT_VERSION_EXTRA "-1")
 set(PROJECT_VERSION "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}")
-set(PROJECT_VERSION_FULL "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}")
+set(PROJECT_VERSION_FULL "${PROJECT_VERSION_MAJOR}.${PROJECT_VERSION_MINOR}.${PROJECT_VERSION_PATCH}${PROJECT_VERSION_EXTRA}")
 
 set(LIBRARY_VERSION "3.0.1")
 set(LIBRARY_SOVERSION "3")
@@ -14,6 +15,7 @@ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git")
     OUTPUT_VARIABLE GIT_DESCRIBE_TAGS ERROR_QUIET)
   if(GIT_DESCRIBE_TAGS)
     string(REGEX REPLACE "^v(.*)" "\\1" GIT_REVISION "${GIT_DESCRIBE_TAGS}")
+    string(STRIP "${GIT_REVISION}" GIT_REVISION)
     if(GIT_REVISION)
       set(PROJECT_VERSION_FULL "${GIT_REVISION}")
     endif(GIT_REVISION)