From 0b56ecfb0460b439d287a7f8615ef53d0d39435a Mon Sep 17 00:00:00 2001 From: Martchus Date: Sun, 26 Jan 2020 19:18:56 +0100 Subject: [PATCH] Run cmake-format individually for each file Seems like cmake-format 0.6.7 only applies CLI options to the first file anymore. So in order to have the options applied to all files and not just the first one just invoke it for each file individually. --- cmake/modules/BasicConfig.cmake | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/cmake/modules/BasicConfig.cmake b/cmake/modules/BasicConfig.cmake index 509102a..bc99dfa 100644 --- a/cmake/modules/BasicConfig.cmake +++ b/cmake/modules/BasicConfig.cmake @@ -363,9 +363,20 @@ if (NOT META_NO_TIDY if (NOT META_CMAKE_FORMAT_OPTIONS) set(META_CMAKE_FORMAT_OPTIONS --tab-size=4 --separate-ctrl-name-with-space=True --line-width=125 --autosort=False) endif () + set(CMAKE_FORMAT_COMMANDS) + foreach (FILE_TO_FORMAT ${FORMATABLE_FILES_CMAKE}) + list( + APPEND + CMAKE_FORMAT_COMMANDS + COMMAND + "${CMAKE_FORMAT_BIN}" + --in-place + ${META_CMAKE_FORMAT_OPTIONS} + "${FILE_TO_FORMAT}") + endforeach () add_custom_target( "${META_TARGET_NAME}_cmake_tidy" - COMMAND "${CMAKE_FORMAT_BIN}" --in-place ${META_CMAKE_FORMAT_OPTIONS} ${FORMATABLE_FILES_CMAKE} + ${CMAKE_FORMAT_COMMANDS} WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}" COMMENT "Tidying ${META_PROJECT_NAME} sources using cmake-format" DEPENDS "${FORMATABLE_FILES_CMAKE}")