summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-12-23 14:37:48 (GMT)
committerKitware Robot <kwrobot@kitware.com>2020-12-23 14:37:57 (GMT)
commit6f7d7e4dbfffe27361e1d9d352acd3754a7407b4 (patch)
treed0a865d6bc204f0a632b0069f744a7919b8cb241
parent91003e99e73d51db47d067783a40d27082353b1b (diff)
parent8c14c6bd0bd0b47fa1eb16993439404139a7086c (diff)
downloadCMake-6f7d7e4dbfffe27361e1d9d352acd3754a7407b4.zip
CMake-6f7d7e4dbfffe27361e1d9d352acd3754a7407b4.tar.gz
CMake-6f7d7e4dbfffe27361e1d9d352acd3754a7407b4.tar.bz2
Merge topic 'editorconfig'
8c14c6bd0b Add .editorconfig file Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Michael Hirsch, Ph.D. <michael@scivision.dev> Merge-request: !5629
-rw-r--r--.editorconfig10
-rw-r--r--.gitattributes1
2 files changed, 11 insertions, 0 deletions
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..e5e7e30
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,10 @@
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[{CMakeLists.txt,*.cmake,*.rst}]
+indent_size = 2
+indent_style = space
diff --git a/.gitattributes b/.gitattributes
index 3da2d60..fac38df 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,6 @@
.git* export-ignore
.hooks* export-ignore
+.editorconfig export-ignore
# Custom attribute to mark sources as using our C code style.
[attr]our-c-style whitespace=tab-in-indent format.clang-format-6.0