[CMake] Minor fixes in clang/cmake format

Author: lukaszstolarczuk

.github/workflows/pr_push.yml

@@ -106,10 +106,10 @@ jobs:
         -DUMF_BUILD_LIBUMF_POOL_SCALABLE=OFF
         -DUMF_BUILD_LIBUMF_POOL_JEMALLOC=OFF
 
-    - name: Check clang-format
+    - name: Check C/C++ formatting
       run: cmake --build build --target clang-format-check
 
-    - name: Check cmake-format
+    - name: Check CMake formatting
       run: cmake --build build --target cmake-format-check
 
     - name: Check Python formatting

CMakeLists.txt

@@ -25,10 +25,9 @@ option(UMF_BUILD_EXAMPLES "Build UMF examples" ON)
 option(UMF_ENABLE_POOL_TRACKING "Build UMF with pool tracking" ON)
 option(UMF_DEVELOPER_MODE "Enable developer checks, treats warnings as errors"
        OFF)
-option(
-    UMF_FORMAT_CODE_STYLE
-    "Add clang, cmake, and black -format-check and -format-apply targets to make"
-    OFF)
+option(UMF_FORMAT_CODE_STYLE
+       "Add clang, cmake, and black -format-check and -format-apply targets"
+       OFF)
 option(USE_ASAN "Enable AddressSanitizer checks" OFF)
 option(USE_UBSAN "Enable UndefinedBehaviorSanitizer checks" OFF)
 option(USE_TSAN "Enable ThreadSanitizer checks" OFF)
@@ -260,14 +259,17 @@ if(UMF_FORMAT_CODE_STYLE)
     find_program(CMAKE_FORMAT NAMES cmake-format)
     find_program(BLACK NAMES black)
 
+    set(CLANG_FORMAT_REQUIRED "15.0")
+    set(CMAKE_FORMAT_REQUIRED "0.6")
+
     if(NOT CLANG_FORMAT
        AND NOT CMAKE_FORMAT
        AND NOT BLACK)
         message(
             FATAL_ERROR
                 "UMF_FORMAT_CODE_STYLE=ON, but neither clang-format (required version: "
                 "${CLANG_FORMAT_REQUIRED}), nor cmake-format (required version: "
-                "${CMAKE_FORMAT_VERSION}), nor black was found.")
+                "${CMAKE_FORMAT_REQUIRED}), nor black was found.")
     endif()
 
     if(CLANG_FORMAT)
@@ -277,7 +279,6 @@ if(UMF_FORMAT_CODE_STYLE)
 
         # Check if clang-format (in correct version) is available for code
         # formatting.
-        set(CLANG_FORMAT_REQUIRED "15.0")
         if(NOT (CLANG_FORMAT_VERSION VERSION_EQUAL CLANG_FORMAT_REQUIRED))
             message(FATAL_ERROR "Required clang-format version is "
                                 "${CLANG_FORMAT_REQUIRED}")
@@ -307,8 +308,8 @@ if(UMF_FORMAT_CODE_STYLE)
         file(GLOB_RECURSE format_list ${format_clang_glob})
 
         message(
-            STATUS "Adding 'clang-format-check' and 'clang-format-apply' make "
-                   "targets")
+            STATUS
+                "Adding 'clang-format-check' and 'clang-format-apply' targets")
 
         add_custom_target(
             clang-format-check
@@ -318,7 +319,7 @@ if(UMF_FORMAT_CODE_STYLE)
 
         add_custom_target(
             clang-format-apply
-            COMMAND ${CLANG_FORMAT} --style=file --i ${format_list}
+            COMMAND ${CLANG_FORMAT} --style=file -i ${format_list}
             COMMENT "Format files using clang-format")
     endif()
 
@@ -329,7 +330,6 @@ if(UMF_FORMAT_CODE_STYLE)
 
         # Check if cmake-format (in correct version) is available for cmake
         # files formatting.
-        set(CMAKE_FORMAT_REQUIRED "0.6")
         if(NOT (CMAKE_FORMAT_VERSION VERSION_EQUAL CMAKE_FORMAT_REQUIRED))
             message(FATAL_ERROR "Required cmake-format version is"
                                 "${CMAKE_FORMAT_REQUIRED}")
@@ -357,8 +357,8 @@ if(UMF_FORMAT_CODE_STYLE)
         list(APPEND format_cmake_list "${PROJECT_SOURCE_DIR}/CMakeLists.txt")
 
         message(
-            STATUS "Adding 'cmake-format-check' and 'cmake-format-apply' make "
-                   "targets")
+            STATUS
+                "Adding 'cmake-format-check' and 'cmake-format-apply' targets")
 
         add_custom_target(
             cmake-format-check
@@ -379,8 +379,7 @@ if(UMF_FORMAT_CODE_STYLE)
 
         message(
             STATUS
-                "Adding 'black-format-check' and 'black-format-apply' make targets"
-        )
+                "Adding 'black-format-check' and 'black-format-apply' targets")
 
         add_custom_target(
             black-format-check
@@ -417,10 +416,14 @@ if(UMF_FORMAT_CODE_STYLE)
             COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
                     black-format-apply
             COMMENT "Format C/C++, CMake, and Python files")
+        message(
+            STATUS
+                "  Adding convenience targets 'format-check' and 'format-apply'."
+        )
     else()
         message(
             STATUS
-                "  Convenience targets 'make format-check' and 'make format-apply' are "
+                "  Convenience targets 'format-check' and 'format-apply' are "
                 "not available. Use commands specific for found tools (see the log above)."
         )
     endif()