summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoel Rosdahl <joel@rosdahl.net>2020-09-18 09:28:14 +0200
committerJoel Rosdahl <joel@rosdahl.net>2020-09-21 20:43:15 +0200
commit04ebe301ec0afed7d66b0354a0966f24013bf54e (patch)
tree44b7333c45852bafcbd260b0170edf5a833cec40
parent4ef9757297ac743a568ff0352a9f70f3cc8c22f3 (diff)
downloadccache-04ebe301ec0afed7d66b0354a0966f24013bf54e.tar.gz
Fix capitalization of CMake, Cppcheck, Clang-Format and Clang-Tidy
-rw-r--r--.clang-format2
-rw-r--r--.git-blame-ignore-revs2
-rw-r--r--CONTRIBUTING.md6
-rw-r--r--cmake/CodeAnalysis.cmake12
-rw-r--r--cmake/StandardWarnings.cmake2
-rwxr-xr-xmisc/format-files2
-rw-r--r--src/.clang-tidy2
-rw-r--r--unittest/.clang-tidy2
8 files changed, 15 insertions, 15 deletions
diff --git a/.clang-format b/.clang-format
index 6b56d23a..f40eea44 100644
--- a/.clang-format
+++ b/.clang-format
@@ -1,4 +1,4 @@
-# This configuration should work with clang-format 6.0 and higher.
+# This configuration should work with Clang-Format 6.0 and higher.
---
Language: Cpp
BasedOnStyle: LLVM
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
index c5b35299..41568540 100644
--- a/.git-blame-ignore-revs
+++ b/.git-blame-ignore-revs
@@ -1,2 +1,2 @@
-# Run clang-format on all code to follow the new code style
+# Run Clang-Format on all code to follow the new code style.
f5795cdbc0703d80ab21f39c49bb2384ea2429ba
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 6831e02f..361a660e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -58,10 +58,10 @@ Source code formatting is defined by `.clang-format` in the root directory. The
format is loosely based on [LLVM's code formatting
style](https://llvm.org/docs/CodingStandards.html) with some exceptions. It's
highly recommended to install
-[clang-format](https://clang.llvm.org/docs/ClangFormat.html) 6.0 or newer and
+[Clang-Format](https://clang.llvm.org/docs/ClangFormat.html) 6.0 or newer and
run `make format` to format changes according to ccache's code style. Or even
-better: set up your editor to run clang-format automatically when saving. If
-you don't run clang-format then the ccache authors have to do it for you.
+better: set up your editor to run Clang-Format automatically when saving. If
+you don't run Clang-Format then the ccache authors have to do it for you.
Please follow these conventions:
diff --git a/cmake/CodeAnalysis.cmake b/cmake/CodeAnalysis.cmake
index ae31cd90..4e639a78 100644
--- a/cmake/CodeAnalysis.cmake
+++ b/cmake/CodeAnalysis.cmake
@@ -1,7 +1,7 @@
-option(ENABLE_CPPCHECK "Enable static analysis with cppcheck" OFF)
+option(ENABLE_CPPCHECK "Enable static analysis with Cppcheck" OFF)
if(ENABLE_CPPCHECK)
if(${CMAKE_VERSION} VERSION_LESS "3.10")
- message(WARNING "CppCheck requires cmake 3.10")
+ message(WARNING "Cppcheck requires CMake 3.10")
else()
find_program(CPPCHECK_EXE cppcheck)
mark_as_advanced(CPPCHECK_EXE) # Don't show in CMake UIs
@@ -18,21 +18,21 @@ if(ENABLE_CPPCHECK)
--template="cppcheck: warning: {id}:{file}:{line}: {message}"
-i src/third_party)
else()
- message(WARNING "cppcheck requested but executable not found")
+ message(WARNING "Cppcheck requested but executable not found")
endif()
endif()
endif()
-option(ENABLE_CLANG_TIDY "Enable static analysis with clang-tidy" OFF)
+option(ENABLE_CLANG_TIDY "Enable static analysis with Clang-Tidy" OFF)
if(ENABLE_CLANG_TIDY)
if(${CMAKE_VERSION} VERSION_LESS "3.6")
- message(WARNING "clang-tidy requires cmake 3.6")
+ message(WARNING "Clang-Tidy requires CMake 3.6")
else()
find_program(CLANGTIDY clang-tidy)
if(CLANGTIDY)
set(CMAKE_CXX_CLANG_TIDY ${CLANGTIDY})
else()
- message(SEND_ERROR "clang-tidy requested but executable not found")
+ message(SEND_ERROR "Clang-Tidy requested but executable not found")
endif()
endif()
endif()
diff --git a/cmake/StandardWarnings.cmake b/cmake/StandardWarnings.cmake
index f879da09..dbb45f16 100644
--- a/cmake/StandardWarnings.cmake
+++ b/cmake/StandardWarnings.cmake
@@ -138,7 +138,7 @@ elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
standard_warnings "-Wno-unused-variable")
endif()
elseif(MSVC)
- # Remove any warning level flags added by cmake.
+ # Remove any warning level flags added by CMake.
string(REGEX REPLACE "/W[0-4]" "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
string(REGEX REPLACE "/W[0-4]" "" CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS}")
string(REGEX REPLACE "/W[0-4]" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
diff --git a/misc/format-files b/misc/format-files
index d5497843..1c0405b1 100755
--- a/misc/format-files
+++ b/misc/format-files
@@ -43,7 +43,7 @@ for file in "$@"; do
if [ -n "$check" ]; then
status=1
- echo "Error: $file not formatted with clang-format"
+ echo "Error: $file not formatted with Clang-Format"
echo 'Run "make format" or apply this diff:'
git diff $cf_color --no-index "$file" "$tmp_file" \
| sed -r -e "s!^---.*!--- a/$file!" \
diff --git a/src/.clang-tidy b/src/.clang-tidy
index 3b8edba8..5b05927d 100644
--- a/src/.clang-tidy
+++ b/src/.clang-tidy
@@ -55,7 +55,7 @@ WarningsAsErrors: '*'
# Only include headers directly in src.
HeaderFilterRegex: 'src/[^/]*$'
CheckOptions:
- # Always add braces (added here just in case clang-tidy default changes).
+ # Always add braces (added here just in case Clang-Tidy default changes).
- key: readability-braces-around-statements.ShortStatementLines
value: 0
diff --git a/unittest/.clang-tidy b/unittest/.clang-tidy
index 38b132b4..79cbdb27 100644
--- a/unittest/.clang-tidy
+++ b/unittest/.clang-tidy
@@ -4,7 +4,7 @@ WarningsAsErrors: '*'
# Only include headers directly in unittest.
HeaderFilterRegex: 'unittest/[^/]*$'
CheckOptions:
- # Always add braces (added here just in case clang-tidy default changes).
+ # Always add braces (added here just in case Clang-Tidy default changes).
- key: readability-braces-around-statements.ShortStatementLines
value: 0