From 6c4e78e8a55eab681393faff888448c887bb7127 Mon Sep 17 00:00:00 2001
From: Kitsune Ral <Kitsune-Ral@users.sf.net>
Date: Tue, 9 Jul 2019 12:32:48 +0900
Subject: CMakeLists.txt: fix things around clang-format, inherit
 CLANG_FORMAT_ARGS

---
 .clang-format | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to '.clang-format')

diff --git a/.clang-format b/.clang-format
index 9bb23403..a0b2ba11 100644
--- a/.clang-format
+++ b/.clang-format
@@ -32,7 +32,7 @@ AlignOperands: true
 #AllowShortLoopsOnASingleLine: false
 #AlwaysBreakAfterReturnType: None
 #AlwaysBreakBeforeMultilineStrings: false
-AlwaysBreakTemplateDeclarations: Yes
+#AlwaysBreakTemplateDeclarations: true
 #BinPackArguments: true
 #BinPackParameters: true
 BraceWrapping:   
@@ -53,7 +53,7 @@ BraceWrapping:
 BreakBeforeBinaryOperators: NonAssignment
 BreakBeforeBraces: Custom
 #BreakBeforeInheritanceComma: false
-BreakInheritanceList: BeforeColon
+#BreakInheritanceList: BeforeColon # Only supported since clang-format 7
 #BreakBeforeTernaryOperators: true
 #BreakConstructorInitializersBeforeComma: false
 #BreakConstructorInitializers: BeforeComma
-- 
cgit v1.2.3