@@ -118,12 +118,12 @@ function(create_clang_tidy_targets)
118118 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
119119 )
120120 add_custom_target (clang-tidy-all -check
121- COMMAND test ! -f fixes.yaml
121+ COMMAND test ! -s fixes.yaml
122122 DEPENDS clang-tidy-all
123123 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
124124 )
125125 add_custom_target (clang-tidy-diff-check
126- COMMAND test ! -f fixes.yaml
126+ COMMAND test ! -s fixes.yaml
127127 DEPENDS clang-tidy-diff
128128 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
129129 )
@@ -248,6 +248,9 @@ function(swift_setup_clang_tidy)
248248 # First search for an appropriate clang-tidy
249249 if (NOT x_CLANG_TIDY_NAMES)
250250 set (x_CLANG_TIDY_NAMES
251+ run-clang-tidy run-clang-tidy.py
252+ run-clang-tidy-6.0 run-clang-tidy-6.0.py
253+ run-clang-tidy-4.0 run-clang-tidy-4.0.py
251254 clang-tidy60 clang-tidy-6.0
252255 clang-tidy40 clang-tidy-4.0
253256 clang-tidy39 clang-tidy-3.9
@@ -285,11 +288,11 @@ function(swift_setup_clang_tidy)
285288 create_clang_tidy_targets(
286289 TOP_LEVEL ${top_level_project}
287290 ALL_COMMAND
288- ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -- export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
291+ ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
289292 `git ls-files ${srcs} `
290293 DIFF_COMMAND
291294 git diff --diff-filter =ACMRTUXB --quiet --name -only master -- ${srcs} ||
292- ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -- export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
295+ ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
293296 `git diff --diff-filter =ACMRTUXB --name -only master -- ${srcs} `
294297 )
295298 endif ()
0 commit comments