From 197e5b3939709a0cc4924e44c355aa8ad7358b8e Mon Sep 17 00:00:00 2001 From: Andrey Astafyev Date: Wed, 22 Apr 2020 19:14:51 +0300 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=BE=D1=80=D0=BC=D0=B0=D1=82=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BE=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CMLibCodeAnalysisClangAnalyze.cmake | 7 +------ CMLibCodeAnalysisClangTidy.cmake | 7 +------ CMLibCodeAnalysisClazy.cmake | 25 +++++++++++++------------ 3 files changed, 15 insertions(+), 24 deletions(-) diff --git a/CMLibCodeAnalysisClangAnalyze.cmake b/CMLibCodeAnalysisClangAnalyze.cmake index 0042fb3..d84db7a 100644 --- a/CMLibCodeAnalysisClangAnalyze.cmake +++ b/CMLibCodeAnalysisClangAnalyze.cmake @@ -1,9 +1,4 @@ -find_program( - CLANG_CHECK_EXE - NAMES - clang-check-10 - clang-check-9 - clang-check) +find_program(CLANG_CHECK_EXE NAMES clang-check-10 clang-check-9 clang-check) if(CLANG_CHECK_EXE) option(CMLIB_CLANG_ANALYZE_FIX "Perform fixes for Clang-Check" OFF) endif() diff --git a/CMLibCodeAnalysisClangTidy.cmake b/CMLibCodeAnalysisClangTidy.cmake index e6c3305..6751f29 100644 --- a/CMLibCodeAnalysisClangTidy.cmake +++ b/CMLibCodeAnalysisClangTidy.cmake @@ -1,9 +1,4 @@ -find_program( - CLANG_TIDY_EXE - NAMES - clang-tidy-10 - clang-tidy-9 - clang-tidy) +find_program(CLANG_TIDY_EXE NAMES clang-tidy-10 clang-tidy-9 clang-tidy) if(CLANG_TIDY_EXE) option(CMLIB_CLANG_TIDY_FIX "Perform fixes for Clang-Tidy" OFF) endif() diff --git a/CMLibCodeAnalysisClazy.cmake b/CMLibCodeAnalysisClazy.cmake index f56eda1..2090dbb 100644 --- a/CMLibCodeAnalysisClazy.cmake +++ b/CMLibCodeAnalysisClazy.cmake @@ -1,9 +1,5 @@ -find_program( - CLANG_APPLY_REPLACEMENTS_EXE - NAMES - clang-apply-replacements-10 - clang-apply-replacements-9 - clang-apply-replacements) +find_program(CLANG_APPLY_REPLACEMENTS_EXE NAMES clang-apply-replacements-10 clang-apply-replacements-9 + clang-apply-replacements) find_program(CLAZY_EXE NAMES clazy-standalone) @@ -20,21 +16,26 @@ function(add_clazy_check target) set(_sources ${_CLAZY_UNPARSED_ARGUMENTS}) if(NOT _CLAZY_CHECKS) - set(_CLAZY_CHECKS "level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast") + set(_CLAZY_CHECKS + "level2,container-inside-loop,heap-allocated-small-trivial-type,inefficient-qlist,isempty-vs-count,qt-keywords,unneeded-cast" + ) endif() - set(_args -checks=${_CLAZY_CHECKS} -extra-arg="-Wno-unknown-warning-option" -export-fixes=clazy-fixes-file.yaml) + set(_args -checks=${_CLAZY_CHECKS} -extra-arg="-Wno-unknown-warning-option" + -export-fixes=clazy-fixes-file.yaml) if(CLAZY_EXE) if(NOT TARGET clazy-check) add_custom_target(clazy-check) endif() if(CMLIB_CLAZY_FIX) - add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources} - COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR}) + add_custom_target( + clazy-check-${target} + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources} + COMMAND ${CLANG_APPLY_REPLACEMENTS_EXE} ${CMAKE_BINARY_DIR}) else() add_custom_target(clazy-check-${target} WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) + COMMAND ${CLAZY_EXE} ${_args} -p ${CMAKE_BINARY_DIR} ${_sources}) endif() add_dependencies(clazy-check-${target} ${target}) add_dependencies(clazy-check clazy-check-${target})