From 51572635f00748e0206844e34ce48d2f1f75acdb Mon Sep 17 00:00:00 2001 From: Samuel Mehrbrodt Date: Thu, 30 Nov 2017 10:34:10 +0100 Subject: Detect also clang-format versions 5.0.0+ Change-Id: I651f078c20a1a51d636d359c1118f06b71083e8e Reviewed-on: https://gerrit.libreoffice.org/45561 Reviewed-by: Samuel Mehrbrodt Tested-by: Samuel Mehrbrodt --- solenv/clang-format/ClangFormat.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'solenv') diff --git a/solenv/clang-format/ClangFormat.pm b/solenv/clang-format/ClangFormat.pm index 26de82de06e5..1ec19ada2466 100644 --- a/solenv/clang-format/ClangFormat.pm +++ b/solenv/clang-format/ClangFormat.pm @@ -109,7 +109,7 @@ sub is_matching_clang_format_version($$) return 0; } - return `'$clang_format' -version` =~ /^clang-format version $version \(tags/; + return `'$clang_format' -version` =~ /^clang-format version $version(-\d+)? \(tags/; } 1; -- cgit