diff options
| author | Brad King <brad.king@kitware.com> | 2017-02-22 22:00:58 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-02-22 22:00:58 (GMT) |
| commit | 25480ffbf6aacc6a61dd68934131c839eefd036e (patch) | |
| tree | 6c394dfdf515c1fdeeb79eca9c1337d248e140d1 /Source | |
| parent | 970fe6ec2fa5c195f157338bb8b9b3c8766e00a3 (diff) | |
| parent | d5f39a56a44fe061018c6acc15e1c3aa7337ff54 (diff) | |
| download | CMake-25480ffbf6aacc6a61dd68934131c839eefd036e.zip CMake-25480ffbf6aacc6a61dd68934131c839eefd036e.tar.gz CMake-25480ffbf6aacc6a61dd68934131c839eefd036e.tar.bz2 | |
Merge branch 'clang-format-attrs' into release
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/.gitattributes | 31 | ||||
| -rw-r--r-- | Source/CursesDialog/form/.gitattributes | 1 |
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 |