Skip to content

Commit

Permalink
Merge pull request #1819 from DARMA-tasking/1818-fix-arg-reversal-in-…
Browse files Browse the repository at this point in the history
…buildcpp

1818 Fix argument reversal in build_cpp script
  • Loading branch information
nlslatt authored May 19, 2022
2 parents c0d597c + f0c231c commit 2dafa2f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions ci/build_cpp.sh
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@ then
# To easily tell if compilation of given file succeeded special progress bar is used
# (controlled by variable NINJA_STATUS)
export NINJA_STATUS="[ninja][%f/%t] "
time cmake --build ${dashj} . --target "${target}" | tee "$OUTPUT_TMP"
time cmake --build . ${dashj} --target "${target}" | tee "$OUTPUT_TMP"
compilation_ret=${PIPESTATUS[0]}
sed -i '/ninja: build stopped:/d' "$OUTPUT_TMP"

Expand All @@ -206,7 +206,7 @@ then
elif test "$GENERATOR" = "Unix Makefiles"
then
# Gcc outputs warnings and errors to stderr, so there's not much to do
time cmake --build ${dashj} . --target "${target}" 2> >(tee "$OUTPUT_TMP")
time cmake --build . ${dashj} --target "${target}" 2> >(tee "$OUTPUT_TMP")
compilation_ret=$?
WARNS_ERRS=$(cat "$OUTPUT_TMP")
fi
Expand All @@ -215,7 +215,7 @@ then
WARNS_ERRS=${WARNS_ERRS//$'\n'/$DELIMITER}
echo "$WARNS_ERRS" > "$OUTPUT"
else
time cmake --build ${dashj} . --target "${target}"
time cmake --build . ${dashj} --target "${target}"
compilation_ret=$?
fi

Expand Down

0 comments on commit 2dafa2f

Please sign in to comment.