Skip to content

Commit f3d97c4

Browse files
move base definition of CMAKE_PREFIX_PATH into Dockerfile
1 parent ca30681 commit f3d97c4

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

Dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,6 @@ RUN update-ca-certificates
449449

450450
# copy environment initialization script into container
451451
# and make sure the default profile will call it as well
452+
ENV CMAKE_PREFIX_PATH=/usr/local
452453
COPY ./ldmx-env-init.sh /etc/
453-
RUN printf "%s\n" \
454-
". /etc/ldmx-env-init.sh" \
455-
>> /etc/skel/.profile
454+
RUN printf "\n%s\n" ". /etc/ldmx-env-init.sh" >> /etc/skel/.profile

ldmx-env-init.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,6 @@ if [ -z "${LDMX_SW_INSTALL+x}" ]; then
2828
fi
2929
fi
3030

31-
export CMAKE_PREFIX_PATH="/usr/local/"
32-
3331
if [ -n "${LDMX_SW_INSTALL+x}" ]; then
3432
export LD_LIBRARY_PATH="${LDMX_SW_INSTALL}/lib:${LD_LIBRARY_PATH}"
3533
export PYTHONPATH="${LDMX_SW_INSTALL}/python:${LDMX_SW_INSTALL}/lib:${PYTHONPATH}"

0 commit comments

Comments
 (0)