@@ -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 ! -s fixes.yaml
121+ COMMAND test ! -f 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 ! -s fixes.yaml
126+ COMMAND test ! -f fixes.yaml
127127 DEPENDS clang-tidy-diff
128128 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
129129 )
@@ -248,9 +248,6 @@ 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
254251 clang-tidy60 clang-tidy-6.0
255252 clang-tidy40 clang-tidy-4.0
256253 clang-tidy39 clang-tidy-3.9
@@ -288,11 +285,11 @@ function(swift_setup_clang_tidy)
288285 create_clang_tidy_targets(
289286 TOP_LEVEL ${top_level_project}
290287 ALL_COMMAND
291- ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
288+ ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -- export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
292289 `git ls-files ${srcs} `
293290 DIFF_COMMAND
294291 git diff --diff-filter =ACMRTUXB --quiet --name -only master -- ${srcs} ||
295- ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
292+ ${${PROJECT_NAME} _CLANG_TIDY} ${x_EXTRA_ARGS} -p ${CMAKE_BINARY_DIR} -- export-fixes=${CMAKE_CURRENT_SOURCE_DIR} /fixes.yaml
296293 `git diff --diff-filter =ACMRTUXB --name -only master -- ${srcs} `
297294 )
298295 endif ()
0 commit comments