summaryrefslogtreecommitdiffstats
path: root/Utilities/Scripts
diff options
context:
space:
mode:
authorAlex Wang <aw1621107@gmail.com>2016-10-25 17:30:42 (GMT)
committerBrad King <brad.king@kitware.com>2016-10-25 17:38:12 (GMT)
commit68e7250a9facbe7b82cff17af3bf2a831e481f3c (patch)
tree4c52fc66773918807d252118e1c8ce61019fe530 /Utilities/Scripts
parent2a567c68ce6605071f3e21638560493b71ed2841 (diff)
downloadCMake-68e7250a9facbe7b82cff17af3bf2a831e481f3c.zip
CMake-68e7250a9facbe7b82cff17af3bf2a831e481f3c.tar.gz
CMake-68e7250a9facbe7b82cff17af3bf2a831e481f3c.tar.bz2
Features: Fix cxx_right_angle_brackets compiler feature test
The clang-format pass in commit v3.6.0-rc1~54^2~1 (Revise C++ coding style using clang-format, 2016-05-16) changed the template right angle brackets from `>>` to `> >`, which defeats the purpose of this test. Change it back and exclude this content from formatting.
Diffstat (limited to 'Utilities/Scripts')
-rwxr-xr-xUtilities/Scripts/clang-format.bash1
1 files changed, 1 insertions, 0 deletions
diff --git a/Utilities/Scripts/clang-format.bash b/Utilities/Scripts/clang-format.bash
index a7080fc..ad3b3a1 100755
--- a/Utilities/Scripts/clang-format.bash
+++ b/Utilities/Scripts/clang-format.bash
@@ -130,6 +130,7 @@ $git_ls -z -- '*.c' '*.cc' '*.cpp' '*.cxx' '*.h' '*.hh' '*.hpp' '*.hxx' |
# Exclude manually-formatted sources (e.g. with long lines).
egrep -z -v '^Tests/PositionIndependentTargets/pic_test.h' |
+ egrep -z -v '^Tests/CompileFeatures/cxx_right_angle_brackets.cpp' |
# Exclude sources with encoding not suported by clang-format.
egrep -z -v '^Tests/RunCMake/CommandLine/cmake_depends/test_UTF-16LE.h' |