Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
28 commits
Select commit Hold shift + click to select a range
e23f1ed
Added Conan support
jellespijker Aug 6, 2021
af0a4ef
Moved cmake test logic to its own sub folder
jellespijker Aug 7, 2021
d364948
Template type deduced operator+ and - added
jellespijker Aug 7, 2021
6d5e218
Fixed shipped polyclipping_INCLUDE_DIRS
jellespijker Aug 7, 2021
eca9733
enable IPO/LTO
jellespijker Aug 7, 2021
02d42d0
Fixed MSVC logic
jellespijker Aug 7, 2021
91e388a
Disallow in source builds
jellespijker Aug 7, 2021
f165b2d
Add Sanitizers and best practices
jellespijker Aug 7, 2021
2ef7d94
Add .clang-format and .clang-tidy
jellespijker Aug 7, 2021
b84f90a
use include_DIRS for shipped libraries
jellespijker Aug 7, 2021
e3d4135
Fixed Clipper linking error
jellespijker Aug 7, 2021
31c85db
Made ARCUS compile definition public
jellespijker Aug 7, 2021
98c0e66
Allow for building in-source
jellespijker Aug 7, 2021
8d37298
Set building of test to false by default
jellespijker Aug 8, 2021
f668df3
Set OpenMP support to False on MacOS
jellespijker Aug 8, 2021
ab632bd
Merge remote-tracking branch 'origin/conan' into conan
jellespijker Aug 10, 2021
3044738
Enable setting up CuraEngine in Cura
jellespijker Aug 10, 2021
162b7bd
Write CuraEngine exec to user_info
jellespijker Aug 10, 2021
1a5aa19
Removed the ext property
jellespijker Aug 10, 2021
fcb7ddb
Never link python against Framework
jellespijker Aug 10, 2021
f776c44
Merge remote-tracking branch 'origin/master' into conan
jellespijker Sep 8, 2021
4b748ec
Bump up to 4.11
jellespijker Sep 8, 2021
7aa4e41
Merge branch 'master' into conan
jellespijker Sep 28, 2021
731e61d
Merge remote-tracking branch 'origin/master' into conan
jellespijker Oct 1, 2021
69bfcef
Merge branch 'master' into conan
jellespijker Oct 5, 2021
d353260
Merge branch 'master' into conan
jellespijker Nov 4, 2021
4b44992
Update Conan for new layout methods
jellespijker Nov 5, 2021
45f806e
Add Ninja to build_req
jellespijker Nov 5, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
98 changes: 98 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
AccessModifierOffset: -2
AlignAfterOpenBracket: Align
AlignConsecutiveAssignments: None
AlignConsecutiveDeclarations: None
AlignEscapedNewlines: Left
AlignOperands: AlignAfterOperator
AlignTrailingComments: false
AllowAllParametersOfDeclarationOnNextLine: false
AllowShortBlocksOnASingleLine: Never
AllowShortCaseLabelsOnASingleLine: false
AllowShortFunctionsOnASingleLine: None
AllowShortIfStatementsOnASingleLine: Never
AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: Yes
BinPackArguments: false
BinPackParameters: false
BraceWrapping:
AfterClass: true
AfterControlStatement: Always
AfterEnum: false
AfterFunction: true
AfterNamespace: true
AfterObjCDeclaration: false
AfterStruct: true
AfterUnion: true
BeforeCatch: true
BeforeElse: true
IndentBraces: false
SplitEmptyFunction: true
SplitEmptyNamespace: true
SplitEmptyRecord: true
BreakAfterJavaFieldAnnotations: true
BreakBeforeBinaryOperators: NonAssignment
BreakBeforeBraces: Allman
BreakBeforeInheritanceComma: true
BreakBeforeTernaryOperators: true
BreakConstructorInitializers: BeforeColon
BreakConstructorInitializersBeforeComma: false
BreakStringLiterals: true
ColumnLimit: 140
CommentPragmas: '^ IWYU pragma:'
CompactNamespaces: false
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 2
ContinuationIndentWidth: 2
Cpp11BracedListStyle: false
DerivePointerAlignment: false
PointerAlignment: Left
DisableFormat: false
ExperimentalAutoDetectBinPacking: true
FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IncludeCategories:
- Priority: 2
Regex: ^"(llvm|llvm-c|clang|clang-c)/
- Priority: 3
Regex: ^(<|"(gtest|gmock|isl|json)/)
- Priority: 1
Regex: .*
IncludeIsMainRegex: (Test)?$
IndentCaseLabels: false
IndentWidth: 4
IndentWrappedFunctionNames: true
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLinesAtTheStartOfBlocks: true
Language: Cpp
MacroBlockBegin: ''
MacroBlockEnd: ''
MaxEmptyLinesToKeep: 2
NamespaceIndentation: Inner
ObjCBlockIndentWidth: 7
ObjCSpaceAfterProperty: true
ObjCSpaceBeforeProtocolList: false
ReflowComments: true
SortIncludes: CaseSensitive
SortUsingDeclarations: true
SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: true
SpaceAfterTemplateKeyword: false
SpaceBeforeAssignmentOperators: true
SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false
SpacesBeforeTrailingComments: 1
SpacesInAngles: false
SpacesInCStyleCastParentheses: false
SpacesInContainerLiterals: true
SpacesInParentheses: false
SpacesInSquareBrackets: false
Standard: c++20
TabWidth: 4
UseTab: Never
20 changes: 20 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---
Checks: '*,-fuchsia-*,-google-*,-zircon-*,-abseil-*,-modernize-use-trailing-return-type,-llvm-*, -llvmlibc-*'
WarningsAsErrors: '-*'
HeaderFilterRegex: ''
FormatStyle: none
CheckOptions:
- { key: readability-identifier-naming.EnumCase, value: CamelCase }
- { key: readability-identifier-naming.EnumConstantCase, value: UPPER_CASE }
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.ClassMemberCase, value: CamelCase }
- { key: readability-identifier-naming.ClassMemberPostfix, value: _ }
- { key: readability-identifier-naming.ConstantMemberPostfix, value: _ }
- { key: readability-identifier-naming.ConstantPointerCase, value: lower_case }
- { key: readability-identifier-naming.ConstantPointerPostfix,value: _ptr }
- { key: readability-identifier-naming.LocalPointerCase, value: lower_case }
- { key: readability-identifier-naming.LocalPointerPostfix, value: _ptr }
- { key: readability-identifier-naming.VariableCase, value: lower_case }
- { key: readability-identifier-naming.LocalVariableCase, value: lower_case }
- { key: readability-identifier-naming.FunctionCase, value: camelBack }
- { key: readability-identifier-naming.ParameterCase, value: lower_case }
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -61,3 +61,6 @@ documentation/latex/*
## Test results.
tests/output.xml
callgrind.out.*
/cmake-build-release/
/cmake-build-debug/
/tmp/
Loading