summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-05-31 17:40:34 (GMT)
committerBrad King <brad.king@kitware.com>2018-06-01 13:52:02 (GMT)
commit523c443d135f6474cf5a9d0372b3cc364fc7ebe5 (patch)
tree82f22000589d6ded60d2c325b221c5290cda3d3d /Source
parenteb7ec19c1c639e91b812763ead3a56e97d20aec4 (diff)
downloadCMake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.zip
CMake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.tar.gz
CMake-523c443d135f6474cf5a9d0372b3cc364fc7ebe5.tar.bz2
clang-format.bash: update to clang-format-6.0
Update `.clang-format` with configuration to make the 6.0 format as close as possible to what 3.8 produced before. Then revise the style: * Indent preprocessor directives (a feature new since 3.8) * Add a newline and indentation before inheritance `:` and `,` Rename the Git attribute identifying the format to include the clang-format version number: `format.clang-format-6.0`. This will aid external infrastructure in knowing what version of the tool to run.
Diffstat (limited to 'Source')
-rw-r--r--Source/.gitattributes2
-rw-r--r--Source/CursesDialog/form/.gitattributes2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/.gitattributes b/Source/.gitattributes
index 0f829a3..7c160cc 100644
--- a/Source/.gitattributes
+++ b/Source/.gitattributes
@@ -1,2 +1,2 @@
# Do not format third-party sources.
-/kwsys/** -format.clang-format
+/kwsys/** -format.clang-format-6.0
diff --git a/Source/CursesDialog/form/.gitattributes b/Source/CursesDialog/form/.gitattributes
index 62d728c..12ede74 100644
--- a/Source/CursesDialog/form/.gitattributes
+++ b/Source/CursesDialog/form/.gitattributes
@@ -1 +1 @@
-* -format.clang-format
+* -format.clang-format-6.0