aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Szakmeister <john@szakmeister.net>2014-12-03 04:10:52 -0500
committerJohn Szakmeister <john@szakmeister.net>2014-12-03 04:56:50 -0500
commitcf1939aab3dfa4e763ed3e3513eef8e9f7c41a3e (patch)
tree21bfd35702ff812e89aa183236513848f98ef81c
parent143833872b0e477a76b37e06a58b0e49cec03581 (diff)
downloadrneovim-cf1939aab3dfa4e763ed3e3513eef8e9f7c41a3e.tar.gz
rneovim-cf1939aab3dfa4e763ed3e3513eef8e9f7c41a3e.tar.bz2
rneovim-cf1939aab3dfa4e763ed3e3513eef8e9f7c41a3e.zip
build: only manipulate out if getting the timestamp was successful
This fixes an issue seen in #1548, though the real problem is something different.
-rw-r--r--cmake/GetGitRevisionDescription.cmake7
1 files changed, 4 insertions, 3 deletions
diff --git a/cmake/GetGitRevisionDescription.cmake b/cmake/GetGitRevisionDescription.cmake
index 87dc8bab3a..1e0968ec3b 100644
--- a/cmake/GetGitRevisionDescription.cmake
+++ b/cmake/GetGitRevisionDescription.cmake
@@ -158,11 +158,12 @@ function(git_timestamp _var)
OUTPUT_VARIABLE out
ERROR_QUIET
OUTPUT_STRIP_TRAILING_WHITESPACE)
- if(NOT res EQUAL 0)
+ if(res EQUAL 0)
+ string(REGEX REPLACE "[-\" :]" "" out ${out})
+ string(SUBSTRING ${out} 0 12 out)
+ else()
set(out "${out}-${res}-NOTFOUND")
endif()
- string(REGEX REPLACE "[-\" :]" "" out ${out})
- string(SUBSTRING ${out} 0 12 out)
set(${_var} ${out} PARENT_SCOPE)
endfunction()