Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

initial implementation of #150 #151

Draft
wants to merge 4 commits into
base: develop
Choose a base branch
from
Draft

initial implementation of #150 #151

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b0d3861
initial implementation of #150, minus adjustments to `CONTRIBUTING.md`
superwhiskers Jun 3, 2024
3f61b21
use deprecated template declaration breaking option to support clang-…
superwhiskers Jun 3, 2024
ceccebd
integrate suggestions + adjustment to include ordering regex
superwhiskers Jun 11, 2024
8aff4b8
drop integer literal separators
superwhiskers Jun 11, 2024
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
35 changes: 35 additions & 0 deletions .clang-format
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
Language: Cpp
AccessModifierOffset: 0
AlignConsecutiveMacros: true
BreakBeforeBraces: Linux
IndentWidth: 2
ConstructorInitializerIndentWidth: 2
superwhiskers marked this conversation as resolved.
Show resolved Hide resolved
ColumnLimit: 0
AlignAfterOpenBracket: Align
Standard: c++11
pelesh marked this conversation as resolved.
Show resolved Hide resolved
IndentAccessModifiers: true
IndentCaseBlocks: true
IndentCaseLabels: true
IndentGotoLabels: true
cameronrutherford marked this conversation as resolved.
Show resolved Hide resolved
IndentExternBlock: Indent
UseTab: Never
ReflowComments: true
QualifierAlignment: Left
ReferenceAlignment: Pointer
PointerAlignment: Left
InsertBraces: true
NamespaceIndentation: All
LineEnding: LF
AlwaysBreakTemplateDeclarations: true
superwhiskers marked this conversation as resolved.
Show resolved Hide resolved
BinPackArguments: false
BinPackParameters: false
AllowShortFunctionsOnASingleLine: None
AllowAllArgumentsOnNextLine: false
IncludeBlocks: Regroup
IncludeCategories:
- Regex: '^<(resolve|tests)/'
Priority: 1
- Regex: '^<[[:alnum:].]+>'
Priority: -1
- Regex: '.*'
Priority: 0
9 changes: 0 additions & 9 deletions .github/workflows/.clang-format
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib)
# Add CMake sources from `cmake` dir
list(APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake)

# Including clang-format cmake files to do automatic checking of formating
# TODO: Set up clang-format
#include(./cmake/clang-format)

# This will create target `doxygen` for building documentation locally.
# For now, this target is intended only for developers who want to test
# different documentation configurations. To have Doxygen configuration
Expand Down Expand Up @@ -153,7 +149,7 @@ configure_package_config_file(./cmake/ReSolveConfig.cmake.in
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ReSolveConfig.cmake"
"${CMAKE_CURRENT_BINARY_DIR}/ReSolveConfigVersion.cmake"
DESTINATION share/resolve/cmake)

# Add usage examples
add_subdirectory(examples)

Expand Down