commit | e8a094011ba712065ee178fcfc9de1d58f67891d | [log] [tgz] |
---|---|---|
author | Alex Deymo <deymo@google.com> | Wed Sep 23 12:41:15 2015 -0700 |
committer | Alex Deymo <deymo@google.com> | Wed Sep 23 12:41:15 2015 -0700 |
tree | 70043805d3fbd8b3993c514b59b5a4af877852ae | |
parent | 735637c650fd24b2a84ad4f5827ff75b603f05bf [diff] |
Strip whitespace from version string. This fixes a build issue where the version string would contain a line break. This patch was cherry-picked from: https://github.com/kloetzl/libdivsufsort/commit/369151a72a69087cc2c3bc995a6592690ee11421 Bug: 24327902 Test: PROJECT_VERSION_FULL in config.h contains the closing ". Change-Id: If613ac28e2fa94e9e5079023188720a7230809d8
diff --git a/VERSION.cmake b/VERSION.cmake index 8ca8bf8..f7f7e43 100644 --- a/VERSION.cmake +++ b/VERSION.cmake
@@ -14,6 +14,7 @@ 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)