Skip to content

Commit

Permalink
Merge: update clang-format requirement and commit
Browse files Browse the repository at this point in the history
This PR updates the clang-format related changes:
1. the minimal requirement 5.0.1+ -> 5.0.0+
2. update the commit of git-cmake-format

Related PR: #484
  • Loading branch information
yhmtsai authored Mar 23, 2020
2 parents 4b43ad2 + e904400 commit 8e54163
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ The Ginkgo CUDA module has the following __additional__ requirements:
In addition, if you want to contribute code to Ginkgo, you will also need the
following:

* _clang-format 5.0.1+_ (ships as part of _clang_)
* _clang-format 5.0.0+_ (ships as part of _clang_)
* _clang-tidy_ (optional, when setting the flag `-DGINKGO_WITH_CLANG_TIDY=ON`)
* _iwyu_ (Include What You Use, optional, when setting the flag `-DGINKGO_WITH_IWYU=ON`)

Expand Down
4 changes: 2 additions & 2 deletions third_party/git-cmake-format/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
ginkgo_load_git_package(git-cmake-format
"https://github.com/ginkgo-project/git-cmake-format.git"
"46d2b43b24fa3aea366be9cce21abfdfffcf0090"
"-DGCF_CLANGFORMAT_MINIMAL_VERSION=5.0.1")
"29c23665d624e1cae1308bec651706fdaa8fe38b"
"-DGCF_CLANGFORMAT_MINIMAL_VERSION=5.0.0")
add_subdirectory(${CMAKE_CURRENT_BINARY_DIR}/src
${CMAKE_CURRENT_BINARY_DIR}/build EXCLUDE_FROM_ALL)

0 comments on commit 8e54163

Please sign in to comment.