diff options
| author | Clifford Wolf <clifford@clifford.at> | 2018-06-03 12:42:06 +0200 |
|---|---|---|
| committer | Clifford Wolf <clifford@clifford.at> | 2018-06-03 12:42:06 +0200 |
| commit | d41936ecbf983f77e295b36d4ac3fed279243de1 (patch) | |
| tree | be8b83ff404d79e608940760dda080d06504896f | |
| parent | 8b854a9e2867ef78bf7b38974c5819a47b3f03de (diff) | |
| download | nextpnr-d41936ecbf983f77e295b36d4ac3fed279243de1.tar.gz nextpnr-d41936ecbf983f77e295b36d4ac3fed279243de1.tar.bz2 nextpnr-d41936ecbf983f77e295b36d4ac3fed279243de1.zip | |
Update clangformat make target and config
Signed-off-by: Clifford Wolf <clifford@clifford.at>
| -rw-r--r-- | .clang-format | 21 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 11 insertions, 12 deletions
diff --git a/.clang-format b/.clang-format index 3a5940ef..d825df6f 100644 --- a/.clang-format +++ b/.clang-format @@ -21,26 +21,26 @@ AlwaysBreakTemplateDeclarations: false BinPackArguments: true BinPackParameters: true BraceWrapping: - AfterClass: false + AfterClass: true AfterControlStatement: false - AfterEnum: false - AfterFunction: false + AfterEnum: true + AfterFunction: true AfterNamespace: false AfterObjCDeclaration: false - AfterStruct: false - AfterUnion: false + AfterStruct: true + AfterUnion: true BeforeCatch: false BeforeElse: false IndentBraces: false BreakBeforeBinaryOperators: None -BreakBeforeBraces: Attach +BreakBeforeBraces: Custom BreakBeforeTernaryOperators: true BreakConstructorInitializersBeforeComma: false ColumnLimit: 80 CommentPragmas: '^ IWYU pragma:' ConstructorInitializerAllOnOneLineOrOnePerLine: false -ConstructorInitializerIndentWidth: 4 -ContinuationIndentWidth: 4 +ConstructorInitializerIndentWidth: 8 +ContinuationIndentWidth: 8 Cpp11BracedListStyle: true DerivePointerAlignment: false DisableFormat: false @@ -54,14 +54,14 @@ IncludeCategories: - Regex: '.*' Priority: 1 IndentCaseLabels: false -IndentWidth: 2 +IndentWidth: 4 IndentWrappedFunctionNames: false KeepEmptyLinesAtTheStartOfBlocks: true MacroBlockBegin: '' MacroBlockEnd: '' MaxEmptyLinesToKeep: 1 NamespaceIndentation: None -ObjCBlockIndentWidth: 2 +ObjCBlockIndentWidth: 4 ObjCSpaceAfterProperty: false ObjCSpaceBeforeProtocolList: true PenaltyBreakBeforeFirstCallParameter: 19 @@ -87,4 +87,3 @@ Standard: Cpp11 TabWidth: 8 UseTab: Never ... - diff --git a/CMakeLists.txt b/CMakeLists.txt index 02919994..cd559203 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -68,7 +68,7 @@ foreach (family ${FAMILIES}) endforeach (family) file(GLOB_RECURSE CLANGFORMAT_FILES *.cc *.h) -string(REGEX REPLACE "[^;]*/ice40/chipdbs/chipdb-[^ ]*.cc" "" CLANGFORMAT_FILES "${CLANGFORMAT_FILES}") +string(REGEX REPLACE "[^;]*/ice40/chipdbs/chipdb-[^;]*.cc" "" CLANGFORMAT_FILES "${CLANGFORMAT_FILES}") add_custom_target( clangformat |