diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-11-30 10:34:10 +0100 |
|---|---|---|
| committer | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2017-11-30 12:39:33 +0100 |
| commit | 51572635f00748e0206844e34ce48d2f1f75acdb (patch) | |
| tree | f2a863bdbf60fc5304e06e359c97d7add22e822f /solenv | |
| parent | 25555c50ad2a57c1b2313f39b8132ac5e80a45fd (diff) | |
Detect also clang-format versions 5.0.0+
Change-Id: I651f078c20a1a51d636d359c1118f06b71083e8e
Reviewed-on: https://gerrit.libreoffice.org/45561
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/clang-format/ClangFormat.pm | 2 |
1 files changed, 1 insertions, 1 deletions
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; |