Skip to content

Commit

Permalink
Revert my faulty changes with spellcheck
Browse files Browse the repository at this point in the history
  • Loading branch information
ClausKlein committed Sep 7, 2024
1 parent 92f321c commit 9a81f40
Show file tree
Hide file tree
Showing 3 changed files with 32 additions and 23 deletions.
48 changes: 28 additions & 20 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -4,23 +4,31 @@ IndentWidth: 4
UseTab: Never
---
Language: Cpp
BasedOnStyle: WebKit
# XXX ColumnLimit: 123
AccessModifierOffset: -4
AllowShortIfStatementsOnASingleLine: false
AllowShortFunctionsOnASingleLine: Inline
ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4
DerivePointerAlignment: false
IndentWidth: 4
InsertBraces: true
InsertNewlineAtEOF: true
NamespaceIndentation: None
PointerAlignment: Right
SpacesBeforeTrailingComments: 1
UseTab: Never
#
AlignTrailingComments:
# XXX Kind: Never
Kind: Always
OverEmptyLines: 1
BasedOnStyle: Llvm

# ColumnLimit: 80
# AccessModifierOffset: -2
# AllowShortIfStatementsOnASingleLine: false
# AllowShortFunctionsOnASingleLine: Inline
# ConstructorInitializerIndentWidth: 4
# ContinuationIndentWidth: 4
# DerivePointerAlignment: false
# #
# # TODO: TBD 4 instead of 2? CK
# # XXX IndentWidth: 4
# InsertBraces: true
# InsertNewlineAtEOF: true
# NamespaceIndentation: None
# PointerAlignment: Right
# SpacesBeforeTrailingComments: 1
# UseTab: Never

# TODO: TBD Keep original style? CK
# AlignTrailingComments:
# Kind: Always
# OverEmptyLines: 0

# TODO: TBD Keep original style? CK
# BreakBeforeBraces: Custom
# BraceWrapping:
# AfterNamespace: true
5 changes: 3 additions & 2 deletions chapter05/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,15 @@ project(
add_subdirectory(find_package_example)
add_subdirectory(find_module)
add_subdirectory(fetch_content_example)
# FIXME: add_subdirectory(external_project)
add_subdirectory(external_project)

# Look for the conan command on the host system, if conan is not found exclude
# all conan related examples from the project
find_program(CONAN_EXECUTABLE conan)

if(CONAN_EXECUTABLE)
# add_subdirectory(conan_example) add_subdirectory(conan_conanfile_example)
# add_subdirectory(conan_example)
# add_subdirectory(conan_conanfile_example)
else()
message(STATUS "Conan not found. Will not build conan examples")
endif()
Expand Down
2 changes: 1 addition & 1 deletion chapter05/external_project/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ externalproject_add_step(
COMMAND
${CMAKE_COMMAND} -E tar "cvzf"
${CMAKE_CURRENT_BINARY_DIR}/licenses.tar.gz <SOURCE_DIR>/LICENSE
DEPENDENCIES build
DEPENDEES build
ALWAYS YES
)

Expand Down

0 comments on commit 9a81f40

Please sign in to comment.