Skip to content

Commit

Permalink
Extend DD4hep with UtilityApps and upgrade to 1.23 (#77)
Browse files Browse the repository at this point in the history
* Upgrade DD4hep to v1.23

* Install UtilityApps package of DD4hep
  • Loading branch information
zaborowska authored Nov 29, 2022
1 parent 67c7f8a commit 99840f7
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions ubuntu2004/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -157,15 +157,15 @@ RUN pip3 install jinja2 pyyaml \
# DD4hep
# requires Geant4 and ROOT and must come last
RUN mkdir src \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-21.tar.gz \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-23.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_PREFIX_PATH=${PREFIX} \
-DBUILD_TESTING=OFF \
-DDD4HEP_BUILD_PACKAGES="DDG4 DDDetectors DDRec" \
-DDD4HEP_BUILD_PACKAGES="DDG4 DDDetectors DDRec UtilityApps" \
-DDD4HEP_IGNORE_GEANT4_TLS=ON \
-DDD4HEP_USE_GEANT4=ON \
-DDD4HEP_USE_XERCESC=ON \
Expand Down
4 changes: 2 additions & 2 deletions ubuntu2204/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -150,15 +150,15 @@ RUN pip3 install jinja2 pyyaml \
# DD4hep
# requires Geant4 and ROOT and must come last
RUN mkdir src \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-21.tar.gz \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-23.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_PREFIX_PATH=${PREFIX} \
-DBUILD_TESTING=OFF \
-DDD4HEP_BUILD_PACKAGES="DDG4 DDDetectors DDRec" \
-DDD4HEP_BUILD_PACKAGES="DDG4 DDDetectors DDRec UtilityApps" \
-DDD4HEP_IGNORE_GEANT4_TLS=ON \
-DDD4HEP_USE_GEANT4=ON \
-DDD4HEP_USE_XERCESC=ON \
Expand Down
4 changes: 2 additions & 2 deletions ubuntu2204_clang/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -156,15 +156,15 @@ RUN pip3 install jinja2 pyyaml \
# DD4hep
# requires Geant4 and ROOT and must come last
RUN mkdir src \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-21.tar.gz \
&& ${GET} https://github.com/AIDASoft/DD4hep/archive/v01-23.tar.gz \
| ${UNPACK_TO_SRC} \
&& cmake -B build -S src -GNinja \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_INSTALL_PREFIX=${PREFIX} \
-DCMAKE_PREFIX_PATH=${PREFIX} \
-DBUILD_TESTING=OFF \
-DDD4HEP_BUILD_PACKAGES="DDG4 DDDetectors DDRec" \
-DDD4HEP_BUILD_PACKAGES="DDG4 DDDetectors DDRec UtilityApps" \
-DDD4HEP_IGNORE_GEANT4_TLS=ON \
-DDD4HEP_USE_GEANT4=ON \
-DDD4HEP_USE_XERCESC=ON \
Expand Down

0 comments on commit 99840f7

Please sign in to comment.