summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-17 13:57:49 (GMT)
committerBrad King <brad.king@kitware.com>2018-05-18 13:19:10 (GMT)
commit8cfc45f6bd91b258eccf058913df1490ae2face6 (patch)
tree936bd2d8df7ebdcdc369308e06945989a4e3a419
parentb6ce5aef0fd3b9d0c60643073db1880b857189b8 (diff)
downloadCMake-8cfc45f6bd91b258eccf058913df1490ae2face6.zip
CMake-8cfc45f6bd91b258eccf058913df1490ae2face6.tar.gz
CMake-8cfc45f6bd91b258eccf058913df1490ae2face6.tar.bz2
clang-format: Explicitly require version 3.8 of the tool
Versions of clang-format newer than 3.8 produce different output. Our source code guide says that version 3.8 exactly must be used. Update the comment in our `.clang-format` config file accordingly. Add a check to our formatting script to verify the version. Also update its tool search to look for the explicitly-named 3.8 variant first.
-rw-r--r--.clang-format2
-rwxr-xr-xUtilities/Scripts/clang-format.bash7
2 files changed, 7 insertions, 2 deletions
diff --git a/.clang-format b/.clang-format
index 88bfbd3..c0b5cc3 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,5 +1,5 @@
---
-# This configuration requires clang-format 3.8 or higher.
+# This configuration requires clang-format version 3.8 exactly.
BasedOnStyle: Mozilla
AlignOperands: false
AlwaysBreakAfterReturnType: None
diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index 3b331a1..4c6225d 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -78,8 +78,8 @@ test "$#" = 0 || die "$usage"
# Find a default tool.
tools='
- clang-format
clang-format-3.8
+ clang-format
'
if test "x$clang_format" = "x"; then
for tool in $tools; do
@@ -96,6 +96,11 @@ if ! type -p "$clang_format" >/dev/null; then
exit 1
fi
+if ! "$clang_format" --version | grep 'clang-format version 3\.8' >/dev/null 2>/dev/null; then
+ echo "clang-format version 3.8 is required (exactly)"
+ exit 1
+fi
+
# Select listing mode.
case "$mode" in
'') echo "$usage"; exit 0 ;;