diff --git a/cmake/ClangTools.cmake b/cmake/ClangTools.cmake index 4a356d0296392723adf33d118d41c7111bb1c263..fbc80d6a37b1b59370fe56ea65c70d52b38438d5 100644 --- a/cmake/ClangTools.cmake +++ b/cmake/ClangTools.cmake @@ -31,7 +31,7 @@ function(add_format_target _target) add_dependencies(format format-${_target}) add_custom_target(check-format-${_target} - COMMAND scripts/format-check.sh ${CLANG_FORMAT_PROG} -output-replacements-xml ${ARG_FILES} + COMMAND ${CLANG_FORMAT_PROG} -output-replacements-xml ${ARG_FILES} | grep "<replacement " > /dev/null && exit 1 || exit 0 WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/.. COMMENT "Checking ${_target} code formatting with clang-format" VERBATIM @@ -55,7 +55,7 @@ function(add_tidy_target _target) add_dependencies(tidy tidy-${_target}) add_custom_target(check-tidy-${_target} - COMMAND scripts/fail-on-output.sh ${CLANG_TIDY_PROG} -p=${CMAKE_BINARY_DIR} ${ARG_FILES} + COMMAND ${CLANG_TIDY_PROG} -p=${CMAKE_BINARY_DIR} ${ARG_FILES} | grep . && exit 1 || exit 0 WORKING_DIRECTORY ${CMAKE_CURRENT_LIST_DIR}/.. DEPENDS ${ARG_DEPENDS} COMMENT "Running clang-tidy for ${_target}" diff --git a/scripts/fail-on-output.sh b/scripts/fail-on-output.sh deleted file mode 100755 index ea21216d60af5af4527f6b1d1c0d155bf8faaa40..0000000000000000000000000000000000000000 --- a/scripts/fail-on-output.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/env bash -output="$($@)" -if [[ "$output" ]]; then - echo "$output" - exit 1 -fi diff --git a/scripts/format-check.sh b/scripts/format-check.sh deleted file mode 100755 index 916855f9578dbe9e46a4f8ea264df36a0f5d0bcf..0000000000000000000000000000000000000000 --- a/scripts/format-check.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -# grep the result of clang-format with -output-replacements-xml flag -# if any "replacement" tags are found, then code is incorrectly formatted -echo $($@) | grep '<replacement ' > /dev/null -if [ $? -ne 1 ]; then - echo "Files have to be formatted with clang-format" - exit 1; -fi