@@ -235,8 +235,8 @@ if(UMF_FORMAT_CODE_STYLE)
235
235
message (STATUS "Found cmake-format: ${CMAKE_FORMAT} "
236
236
"(version: ${CMAKE_FORMAT_VERSION} )" )
237
237
238
- # Check if cmake-format (in correct version) is available for code
239
- # formatting.
238
+ # Check if cmake-format (in correct version) is available for cmake
239
+ # files formatting.
240
240
set (CMAKE_FORMAT_REQUIRED "0.6" )
241
241
if (NOT (CMAKE_FORMAT_VERSION VERSION_EQUAL CMAKE_FORMAT_REQUIRED ))
242
242
message (FATAL_ERROR "Required cmake-format version is"
@@ -248,12 +248,13 @@ if(UMF_FORMAT_CODE_STYLE)
248
248
message (
249
249
FATAL_ERROR
250
250
"UMF_FORMAT_CODE_STYLE=ON, but neither clang-format (required version: "
251
- "${CLANG_FORMAT_REQUIRED} ) nor cmake-format was found." )
251
+ "${CLANG_FORMAT_REQUIRED} ) nor cmake-format (required version: "
252
+ "${CMAKE_FORMAT_VERSION} ) was found." )
252
253
endif ()
253
254
254
255
# Obtain files for clang-format check
255
256
set (format_glob )
256
- foreach (DIR IN ITEMS include examples src test benchmark )
257
+ foreach (DIR IN ITEMS benchmark examples include src test )
257
258
list (APPEND format_glob
258
259
"${DIR} /*.h"
259
260
"${DIR} /*.hpp"
@@ -297,12 +298,6 @@ if(UMF_FORMAT_CODE_STYLE)
297
298
file (GLOB_RECURSE format_cmake_list ${format_cmake_glob} )
298
299
list (APPEND format_cmake_list "${PROJECT_SOURCE_DIR} /CMakeLists.txt" )
299
300
300
- # Print the list of files targeted for formatting by cmake-format
301
- message (STATUS "Files to be formatted with cmake-format:" )
302
- foreach (file IN LISTS format_cmake_list )
303
- message (STATUS "${file} " )
304
- endforeach ()
305
-
306
301
message (STATUS "Adding cmake-format-check and cmake-format-apply make "
307
302
"targets" )
308
303
@@ -319,7 +314,7 @@ if(UMF_FORMAT_CODE_STYLE)
319
314
# Add a convenience target for running both clang-format and cmake-format
320
315
# checks/apply
321
316
add_custom_target (
322
- format-checks
317
+ format-check
323
318
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
324
319
clang-format-check
325
320
COMMAND ${CMAKE_COMMAND} --build ${CMAKE_BINARY_DIR} --target
0 commit comments