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

Jump to bottom

[Geant4] Update Geant4 branch to use 10.7.0 Beta #6010

Merged
merged 1 commit into from
Jul 1, 2020
Merged

[Geant4] Update Geant4 branch to use 10.7.0 Beta #6010

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
8 changes: 4 additions & 4 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
### RPM external geant4 10.6.2
%define tag 2d174b7a10d70c0bc257ede0554bfcab14e75db5
%define branch cms/v%{realversion}
%define github_user cms-externals
### RPM external geant4 10.7.0.beta
%define tag 67ba86d073ec6366df0de75a0f5b5d57920d0b7e
%define branch master
%define github_user Geant4
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz

BuildRequires: cmake gmake
Expand Down
5 changes: 2 additions & 3 deletions vecgeom.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external vecgeom v1.1.6
### RPM external vecgeom v1.1.7
Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{realversion}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: cmake gmake
%define keep_archives true
Expand All @@ -17,6 +17,7 @@ cd ../build

cmake ../%{n}-%{realversion} \
-DCMAKE_INSTALL_PREFIX=%{i} \
-DCMAKE_INSTALL_LIBDIR=%{i}/lib \
-DROOT=OFF \
-DCMAKE_BUILD_TYPE=Release \
-DNO_SPECIALIZATION=ON \
Expand All @@ -43,7 +44,5 @@ perl -p -i -e 's|set\(VECGEOM_EXTERNAL_INCLUDES .*|set(VECGEOM_EXTERNAL_INCLUDES
$(grep -R 'set(VECGEOM_EXTERNAL_INCLUDES ' %{i}/lib/cmake | sed 's|:.*||' | sort | uniq)

%post
%{relocateConfig}lib/cmake/USolids/*.cmake
%{relocateConfig}lib/cmake/VecCore/*.cmake
%{relocateConfig}lib/cmake/VecGeom/*.cmake