From 60f4108dab31a6584b08bec8fe132ffcaeeeaf33 Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Tue, 15 Jan 2019 09:17:49 -0700 Subject: [PATCH] fix clang tidy script - fix additional args ($@) - do not quote ARGS, otherwise it doesn't work --- contrib/utilities/run_clang_tidy.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/utilities/run_clang_tidy.sh b/contrib/utilities/run_clang_tidy.sh index ebf6f8e5f2..8741032d7a 100755 --- a/contrib/utilities/run_clang_tidy.sh +++ b/contrib/utilities/run_clang_tidy.sh @@ -43,7 +43,7 @@ echo "SRC-DIR=$SRC" # disable muparser (to avoid warnings with bundled one) # enable MPI (to get MPI warnings) # export compile commands (so that run-clang-tidy.py works) -ARGS="-D DEAL_II_WITH_MUPARSER=OFF -D DEAL_II_WITH_MPI=ON -D CMAKE_EXPORT_COMPILE_COMMANDS=ON @$" +ARGS="-D DEAL_II_WITH_MUPARSER=OFF -D DEAL_II_WITH_MPI=ON -D CMAKE_EXPORT_COMPILE_COMMANDS=ON $@" # disable performance-inefficient-string-concatenation because we don't care about "a"+to_string(5)+... CHECKS="-*, @@ -64,7 +64,7 @@ if ! [ -x "$(command -v run-clang-tidy.py)" ] || ! [ -x "$(command -v clang++)" exit 2 fi -CC=clang CXX=clang++ cmake "$ARGS" "$SRC" || (echo "cmake failed!"; false) || exit 2 +CC=clang CXX=clang++ cmake $ARGS "$SRC" || (echo "cmake failed!"; false) || exit 2 cmake --build . --target expand_all_instantiations || (echo "make expand_all_instantiations failed!"; false) || exit 3 -- 2.39.5