Skip to content

Commit

Permalink
Merge pull request #8 from emrekovanci:develop
Browse files Browse the repository at this point in the history
Develop
  • Loading branch information
emrekovanci authored Apr 28, 2024
2 parents 1bbfd38 + ea74cc8 commit 88570f5
Show file tree
Hide file tree
Showing 7 changed files with 11 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

# Project
Language: Cpp
Standard: c++17
Standard: c++20
ColumnLimit: 120

# Indentation
Expand Down
3 changes: 3 additions & 0 deletions .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@ Checks: >
-cppcoreguidelines-avoid-magic-numbers,
-fuchsia-*,
fuchsia-multiple-inheritance,
-google-readability-todo,
-hicpp-uppercase-literal-suffix,
-llvm-header-guard,
-llvm-include-order,
-llvmlibc-*,
-misc-non-private-member-variables-in-classes,
-modernize-use-nodiscard,
Expand Down
7 changes: 3 additions & 4 deletions .clangd
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,6 @@
CompileFlags:
Add:
- "-ferror-limit=0"

# if you are using VSCode and CMake Tools(provided by Microsoft) add
# "cmake.copyCompileCommands": "${workspaceFolder}/.vscode/compile_commands.json" to VSCode settings
# because CompilationDatabase field in .clangd doesn't support multiple folders to search
CompilationDatabase: .vscode

Style:
Expand All @@ -21,6 +17,9 @@ InlayHints:
DeducedTypes: Yes
TypeNameLimit: 24

Hover:
ShowAKA: Yes

Diagnostics:
UnusedIncludes: Strict
MissingIncludes: None
Expand Down
1 change: 1 addition & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
"*.clang-tidy": "yaml",
"*.clang-format": "yaml",
"*.clangd": "yaml",
"*.codespellrc": "ini",
},
"files.exclude": {
".cache": true,
Expand Down
2 changes: 1 addition & 1 deletion cmake/Platform/Common/CMakePresets.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"hidden": true,
"cacheVariables": {
"CMAKE_CXX_EXTENSIONS": "OFF",
"CMAKE_CXX_STANDARD": "17",
"CMAKE_CXX_STANDARD": "20",
"CMAKE_CXX_STANDARD_REQUIRED": "ON"
}
},
Expand Down
2 changes: 1 addition & 1 deletion library/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ add_library(Core
src/Core/Lib.cpp
)
target_include_directories(Core PUBLIC "$<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/include>")
target_compile_features(Core PUBLIC cxx_std_17)
target_compile_features(Core PUBLIC cxx_std_20)

include(GenerateExportHeader)
generate_export_header(Core
Expand Down
2 changes: 1 addition & 1 deletion library/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ set(CMAKE_CATCH_DISCOVER_TESTS_DISCOVERY_MODE PRE_TEST)

add_executable(CoreTests Tests.cpp)
target_link_libraries(CoreTests PRIVATE Core Catch2::Catch2WithMain)
target_compile_features(CoreTests PRIVATE cxx_std_17)
target_compile_features(CoreTests PRIVATE cxx_std_20)

# ---- Tests ----

Expand Down

0 comments on commit 88570f5

Please sign in to comment.