summaryrefslogtreecommitdiffstats
path: root/Source
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-02-23 12:35:32 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2017-02-23 12:35:32 (GMT)
commitd23f4414c44b977abc3f9ff49aa06f709a3d9db1 (patch)
tree1302fa37f072c825d19da60c20edf31c8cdffe0a /Source
parente68aad3eb88b910266b7af3f80f9ee8a6370401c (diff)
parentd5f39a56a44fe061018c6acc15e1c3aa7337ff54 (diff)
downloadCMake-d23f4414c44b977abc3f9ff49aa06f709a3d9db1.zip
CMake-d23f4414c44b977abc3f9ff49aa06f709a3d9db1.tar.gz
CMake-d23f4414c44b977abc3f9ff49aa06f709a3d9db1.tar.bz2
Merge topic 'clang-format-attrs'
d5f39a56 clang-format.bash: Use Git attributes to mark files for formatting f6986ee4 Define a custom Git attribute to mark sources using our C style 2256c3a7 Define a custom Git attribute to mark source files as generated
Diffstat (limited to 'Source')
-rw-r--r--Source/.gitattributes31
-rw-r--r--Source/CursesDialog/form/.gitattributes1
2 files changed, 22 insertions, 10 deletions
diff --git a/Source/.gitattributes b/Source/.gitattributes
index dbd6382..1cec8a3 100644
--- a/Source/.gitattributes
+++ b/Source/.gitattributes
@@ -1,10 +1,21 @@
-# Preserve indentation style in generated code.
-cmCommandArgumentLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmCommandArgumentLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmDependsJavaLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmDependsJavaLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmExprLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmExprLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmFortranLexer.cxx whitespace=-tab-in-indent,-indent-with-non-tab
-cmFortranLexer.h whitespace=-tab-in-indent,-indent-with-non-tab
-cmListFileLexer.c whitespace=-tab-in-indent,-indent-with-non-tab
+/cmCommandArgumentLexer.cxx generated
+/cmCommandArgumentLexer.h generated
+/cmCommandArgumentParser.cxx generated
+/cmCommandArgumentParserTokens.h generated
+/cmDependsJavaLexer.cxx generated
+/cmDependsJavaLexer.h generated
+/cmDependsJavaParser.cxx generated
+/cmDependsJavaParserTokens.h generated
+/cmExprLexer.cxx generated
+/cmExprLexer.h generated
+/cmExprParser.cxx generated
+/cmExprParserTokens.h generated
+/cmFortranLexer.cxx generated
+/cmFortranLexer.h generated
+/cmFortranParser.cxx generated
+/cmFortranParserTokens.h generated
+/cmListFileLexer.c generated
+
+# Do not format third-party sources.
+/bindexplib.* -format.clang-format
+/kwsys/** -format.clang-format
diff --git a/Source/CursesDialog/form/.gitattributes b/Source/CursesDialog/form/.gitattributes
new file mode 100644
index 0000000..62d728c
--- /dev/null
+++ b/Source/CursesDialog/form/.gitattributes
@@ -0,0 +1 @@
+* -format.clang-format