Merge branch 'master' into hip-extension

TheLartians · Dec 29, 2024 · 7641d4f · 7641d4f
2 parents 996b98d + 75a7238
commit 7641d4f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ After [adding CPM.cmake](https://github.com/cpm-cmake/CPM.cmake#adding-cpm), add
 
 ```cmake
 include(cmake/CPM.cmake)
-CPMAddPackage("gh:TheLartians/Format.cmake@1.7.3")
+CPMAddPackage("gh:TheLartians/Format.cmake@1.8.2")
 ```
 
 #### Advanced configuration
@@ -47,9 +47,9 @@ This package supports optional parameters that you can specify in the CPM.cmake
 ```CMake
 CPMAddPackage(
   NAME Format.cmake
-  VERSION 1.7.3
+  VERSION 1.8.2
   GITHUB_REPOSITORY TheLartians/Format.cmake
-  OPTIONS 
+  OPTIONS
       # set to yes skip cmake formatting
       "FORMAT_SKIP_CMAKE NO"
       # set to yes skip clang formatting

diff --git a/cmake-format.cmake b/cmake-format.cmake
@@ -34,7 +34,7 @@ string(STRIP ${GIT_TOPLEVEL} GIT_TOPLEVEL)
 
 get_cmake_files(
   GIT_REPOSITORY_DIR ${GIT_TOPLEVEL} OUTPUT_LIST CMAKE_FILES REGEX
-  "\\.cmake$|(^|/)CMakeLists\\.txt$"
+  "\\.cmake$|\\.cmake\\.in$|(^|/)CMakeLists\\.txt$"
 )
 
 separate_arguments(CMAKE_FORMAT_EXTRA_ARGS)

diff --git a/git-clang-format.py b/git-clang-format.py
@@ -25,6 +25,7 @@
 """
 
 from __future__ import absolute_import, division, print_function
+
 import argparse
 import collections
 import contextlib
@@ -79,10 +80,9 @@ def main():
       'c', 'h',  # C
       'm',  # ObjC
       'mm',  # ObjC++
-      'cc', 'cp', 'cpp', 'ipp', 'c++', 'cxx', 'hh', 'hpp', 'hxx', 'inc', 'inl', # C++
+      'cc', 'cp', 'cpp', 'ipp', 'c++', 'cxx', 'hh', 'hpp', 'hxx', 'inc', 'inl',  # C++
       'ccm', 'cppm', 'cxxm', 'c++m',  # C++ Modules
-      'cu', 'cuh', # CUDA
-      'hip',  # HIP
+      'cu', 'cuh',  # CUDA
       # Other languages that clang-format supports
       'proto', 'protodevel',  # Protocol Buffers
       'java',  # Java
@@ -91,7 +91,7 @@ def main():
       'cs',  # C Sharp
       'sv', 'svh', 'v', 'vh', # Verilog
       'json',  # JSON
-      ])
+  ])
 
   p = argparse.ArgumentParser(
     usage=usage, formatter_class=argparse.RawDescriptionHelpFormatter,