diff options
| author | Ahmad Samir <a.samirh78@gmail.com> | 2022-03-17 12:57:00 +0200 |
|---|---|---|
| committer | Ahmad Samir <a.samirh78@gmail.com> | 2022-03-17 12:57:00 +0200 |
| commit | 7cb3191ccb1dc24ff21a9e41ec30d52f420c98e6 (patch) | |
| tree | 3be27b80e7d784256f16e51643990dab45b22089 | |
| parent | e96843828d8c3bbd8d63f196cac780108598b1b9 (diff) | |
| download | extra-cmake-modules-7cb3191ccb1dc24ff21a9e41ec30d52f420c98e6.tar.gz extra-cmake-modules-7cb3191ccb1dc24ff21a9e41ec30d52f420c98e6.tar.bz2 | |
KDEClangFormat: se the same source file extensions in clang-format script and target
Previously the clang-format.sh git hook script didn't specify the file
extensions to format; however it looks like with recent(?) clang-format
versions 'git clang-format' will consider .json files if such files were
changed by a commit, which makes the script fail, see:
https://invent.kde.org/frameworks/extra-cmake-modules/-/merge_requests/254
Sepcify the file extensions by passing --extensions to 'git clang-format'
command.
Also add ".hpp" to the file extensions we format, and use the same list of
file extensions everywhere.
| -rw-r--r-- | kde-modules/KDEClangFormat.cmake | 2 | ||||
| -rw-r--r-- | kde-modules/KDEFrameworkCompilerLegacySettings.cmake | 2 | ||||
| -rw-r--r-- | kde-modules/KDEFrameworkCompilerSettings.cmake | 2 | ||||
| -rwxr-xr-x | kde-modules/kde-git-commit-hooks/clang-format.sh | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/kde-modules/KDEClangFormat.cmake b/kde-modules/KDEClangFormat.cmake index 5adba5e9..46be8ad6 100644 --- a/kde-modules/KDEClangFormat.cmake +++ b/kde-modules/KDEClangFormat.cmake @@ -35,7 +35,7 @@ Example usage: .. code-block:: cmake include(KDEClangFormat) - file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h) + file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp *.c) kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) To exclude directories from the formatting add a ``.clang-format`` diff --git a/kde-modules/KDEFrameworkCompilerLegacySettings.cmake b/kde-modules/KDEFrameworkCompilerLegacySettings.cmake index 192d079b..895291c0 100644 --- a/kde-modules/KDEFrameworkCompilerLegacySettings.cmake +++ b/kde-modules/KDEFrameworkCompilerLegacySettings.cmake @@ -76,6 +76,6 @@ endif() if (ECM_GLOBAL_FIND_VERSION VERSION_GREATER_EQUAL 5.80.0) include(KDEClangFormat) # add clang-format target - file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) + file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp *.c) kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) endif () diff --git a/kde-modules/KDEFrameworkCompilerSettings.cmake b/kde-modules/KDEFrameworkCompilerSettings.cmake index 3eb640ef..fa31a93b 100644 --- a/kde-modules/KDEFrameworkCompilerSettings.cmake +++ b/kde-modules/KDEFrameworkCompilerSettings.cmake @@ -64,7 +64,7 @@ add_definitions( # add clang-format target include(KDEClangFormat) -file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.c) +file(GLOB_RECURSE ALL_CLANG_FORMAT_SOURCE_FILES *.cpp *.h *.hpp *.c) kde_clang_format(${ALL_CLANG_FORMAT_SOURCE_FILES}) # add the metainfo platform check diff --git a/kde-modules/kde-git-commit-hooks/clang-format.sh b/kde-modules/kde-git-commit-hooks/clang-format.sh index 42a16a1d..c8bf7565 100755 --- a/kde-modules/kde-git-commit-hooks/clang-format.sh +++ b/kde-modules/kde-git-commit-hooks/clang-format.sh @@ -2,7 +2,7 @@ # Based on okular/hooks/pre-commit, credits go to Albert Astals Cid -readonly output=$(git clang-format -v --diff) +readonly output=$(git clang-format --extensions ".cpp, .h, .hpp, .c" -v --diff) if [[ ! -f .clang-format ]]; then echo "ERROR: no .clang-format file found in repository root, abort format" |