Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update DD4Hep to latest on master #6594

Closed
wants to merge 1 commit into from
Closed

Update DD4Hep to latest on master #6594

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions dd4hep-toolfile.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/dd4hep-core.xml
</client>
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<runtime name="PATH" value="$DD4HEP_CORE_BASE/bin" type="path"/>
<flags cppdefines="DD4HEP_USE_GEANT4_UNITS=1"/>
<use name="root_cxxdefaults"/>
<use name="root"/>
<use name="boost"/>
Expand Down
8 changes: 4 additions & 4 deletions dd4hep.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### RPM external dd4hep v01-14x
### RPM external dd4hep v01-15x

%define tag 934ce101148be15cce7725caad8c25084a272938
%define tag 12caacb209af70835dbdd48efa7ef8d0b77b3dcd
%define branch master
%define github_user AIDASoft
%define keep_archives true
Expand All @@ -23,8 +23,8 @@ CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \
-DDD4HEP_USE_PYROOT=ON \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_BUILD_TYPE=Release \
-DDD4HEP_USE_TBB=ON \
-DCMAKE_PREFIX_PATH=${TBB_ROOT}/cmake/TBB;${CLHEP_ROOT};${XERCES_C_ROOT}"
-DDD4HEP_USE_GEANT4_UNITS=ON \
-DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}"

#Build normal Shared D4Hep without Geant4
rm -rf ../build; mkdir ../build; cd ../build
Expand Down