From cf1939aab3dfa4e763ed3e3513eef8e9f7c41a3e Mon Sep 17 00:00:00 2001 From: John Szakmeister Date: Wed, 3 Dec 2014 04:10:52 -0500 Subject: build: only manipulate out if getting the timestamp was successful This fixes an issue seen in #1548, though the real problem is something different. --- cmake/GetGitRevisionDescription.cmake | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'cmake/GetGitRevisionDescription.cmake') 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() -- cgit