Skip to content

Commit

Permalink
Pass all arguments to the new commands
Browse files Browse the repository at this point in the history
Co-authored-by: Tom Eichlersmith <31970302+tomeichlersmith@users.noreply.github.com>
  • Loading branch information
tvami and tomeichlersmith committed Apr 12, 2024
1 parent 4af63a5 commit 935fe31
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 4 deletions.
2 changes: 1 addition & 1 deletion scripts/ldmx-compile.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,5 +19,5 @@ fi
echo "-- Compiling ldmx-sw in ${LDMX_COMPILE_BUILD} with ${LDMX_COMPILE_CORES} cores"

# Compile ldmx-sw
cmake -B ${LDMX_COMPILE_BUILD}/build -S ${LDMX_COMPILE_BUILD}
cmake -B ${LDMX_COMPILE_BUILD}/build -S ${LDMX_COMPILE_BUILD} $@
cmake --build ${LDMX_COMPILE_BUILD}/build --target install -j=${LDMX_COMPILE_CORES}
2 changes: 1 addition & 1 deletion scripts/ldmx-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -554,7 +554,7 @@ __ldmx_compile() {
###############################################################################

__ldmx_recompFire() {
ldmx . ${LDMX_BASE}/ldmx-sw/scripts/ldmx-recompileAndFire.sh $1
ldmx . ${LDMX_BASE}/ldmx-sw/scripts/ldmx-recompileAndFire.sh $@
}

###############################################################################
Expand Down
3 changes: 1 addition & 2 deletions scripts/ldmx-recompileAndFire.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
# or
# ldmx setenv LDMX_COMPILE_BUILD=<build location>

FIREINPUT=$1

if [ -z "$LDMX_COMPILE_CORES" ]; then
LDMX_COMPILE_CORES=$(nproc)
Expand All @@ -24,4 +23,4 @@ echo "-- Compiling ldmx-sw in ${LDMX_COMPILE_BUILD} with ${LDMX_COMPILE_CORES} c
cmake -B ${LDMX_COMPILE_BUILD}/build -S ${LDMX_COMPILE_BUILD}
cmake --build ${LDMX_COMPILE_BUILD}/build --target install -j=${LDMX_COMPILE_CORES}
# Run fire on the input config
fire $FIREINPUT
fire $@

0 comments on commit 935fe31

Please sign in to comment.