From 1fc35ec5a1ab9775014a2bb090d632dd7dc81d50 Mon Sep 17 00:00:00 2001 From: Dylan Noblesmith Date: Mon, 12 Dec 2011 13:06:25 +0000 Subject: [PATCH] cmake: work with CMake < 2.8.5 CMake versions 2.8.4 and earlier were giving this error since r146323: "string end index: -1 is out of range 0 - 6" Passing -1 as the length of the desired substring was a new feature added in CMake 2.8.5: http://www.cmake.org/Bug/view.php?id=10740 llvm-svn: 146372 --- llvm/cmake/modules/VersionFromVCS.cmake | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/llvm/cmake/modules/VersionFromVCS.cmake b/llvm/cmake/modules/VersionFromVCS.cmake index a55e9b837f38..d6a2ae5f45f5 100644 --- a/llvm/cmake/modules/VersionFromVCS.cmake +++ b/llvm/cmake/modules/VersionFromVCS.cmake @@ -30,7 +30,9 @@ function(add_version_info_from_vcs VERS) OUTPUT_VARIABLE git_output) if( git_result EQUAL 0 ) string(REGEX MATCH r[0-9]+ git_svn_rev ${git_output}) - string(SUBSTRING "${git_svn_rev}" 1 -1 git_svn_rev_number) + string(LENGTH "${git_svn_rev}" rev_length) + math(EXPR rev_length "${rev_length}-1") + string(SUBSTRING "${git_svn_rev}" 1 ${rev_length} git_svn_rev_number) set(SVN_REVISION ${git_svn_rev_number} PARENT_SCOPE) set(git_svn_rev "-svn-${git_svn_rev}") -- GitLab