Skip to content

Commit

Permalink
Update project meta files
Browse files Browse the repository at this point in the history
* Updates clang-format settings
* Updates cmake-format settings
* Updates gitignore file
  • Loading branch information
PatTheMav authored and RytoEX committed Jun 26, 2023
1 parent b77a072 commit 4b2c5dd
Show file tree
Hide file tree
Showing 3 changed files with 52 additions and 14 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ ForEachMacros:
- 'json_object_foreach'
- 'json_object_foreach_safe'
- 'json_array_foreach'
- 'HASH_ITER'
IncludeBlocks: Preserve
IndentCaseLabels: false
IndentPPDirectives: None
Expand Down
30 changes: 27 additions & 3 deletions .cmake-format.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,10 @@
{
"format": {
"line_width": 120,
"tab_size": 2,
"enable_sort": true,
"autosort": true
},
"additional_commands": {
"find_qt": {
"flags": [],
Expand All @@ -8,9 +14,27 @@
"COMPONENTS_MACOS": "+",
"COMPONENTS_LINUX": "+"
}
},
"set_target_properties_obs": {
"pargs": 1,
"flags": [],
"kwargs": {
"PROPERTIES": {
"kwargs": {
"PREFIX": 1,
"OUTPUT_NAME": 1,
"FOLDER": 1,
"VERSION": 1,
"SOVERSION": 1,
"AUTOMOC": 1,
"AUTOUIC": 1,
"AUTORCC": 1,
"AUTOUIC_SEARCH_PATHS": 1,
"BUILD_RPATH": 1,
"INSTALL_RPATH": 1
}
}
}
}
},
"format": {
"line_width": 100
}
}
35 changes: 24 additions & 11 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,13 +1,26 @@
*~
.DS_Store
/build/
/build_*/
/release/
/installer/Output/
# Exclude everything
/*

# Except for default project files
!/.github
!/build-aux
!/cmake
!/data
!/src
!.clang-format
!.cmake-format.json
!.gitignore
!buildspec.json
!CMakeLists.txt
!CMakePresets.json
!LICENSE
!README.md

.vscode
.idea
# Exclude lock files
*.lock.json

# Exclude macOS legacy resource forks
.DS_Store

# ignore generated files
*.generated.*
**/.Brewfile.lock.json
# Exclude CMake build number cache
/cmake/.CMakeBuildNumber

0 comments on commit 4b2c5dd

Please sign in to comment.