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

Update geant 107can00 with vecgeom #6413

Merged
merged 2 commits into from Nov 14, 2020
Merged

Update geant 107can00 with vecgeom #6413

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
125c0a9
[Geant4] Update to 10.7.cand00 (with VecGeom)
mrodozov Nov 11, 2020
f5236bf
get sources from cmsrep for listed pkgs
mrodozov Nov 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions cmssw-tool-conf.spec
View file
Open in desktop
Expand Up @@ -32,6 +32,7 @@ Requires: gcc-toolfile
Requires: gdbm-toolfile
Requires: geant4-toolfile
Requires: geant4data-toolfile
Requires: vecgeom-toolfile
Requires: glimpse-toolfile
Requires: gmake-toolfile
Requires: gsl-toolfile
Expand Down
3 changes: 2 additions & 1 deletion geant4-G4EMLOW.spec
View file
Open in desktop
@@ -1,4 +1,5 @@
### RPM external geant4-G4EMLOW 7.9.1
### RPM external geant4-G4EMLOW 7.13
%define G4RunTime G4LEDATA
%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4EMLOW.%{realversion}.tar.gz

## IMPORT geant4-data-rpm
3 changes: 2 additions & 1 deletion geant4-G4ENSDFSTATE.spec
View file
Open in desktop
@@ -1,4 +1,5 @@
### RPM external geant4-G4ENSDFSTATE 2.2
### RPM external geant4-G4ENSDFSTATE 2.3
%define G4RunTime G4ENSDFSTATEDATA
%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4ENSDFSTATE.%{realversion}.tar.gz

## IMPORT geant4-data-rpm
3 changes: 2 additions & 1 deletion geant4-G4PARTICLEXS.spec
View file
Open in desktop
@@ -1,4 +1,5 @@
### RPM external geant4-G4PARTICLEXS 2.1
### RPM external geant4-G4PARTICLEXS 3.1
%define G4RunTime G4PARTICLEXSDATA
%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4PARTICLEXS.%{realversion}.tar.gz

## IMPORT geant4-data-rpm
3 changes: 2 additions & 1 deletion geant4-G4PhotonEvaporation.spec
View file
Open in desktop
@@ -1,4 +1,5 @@
### RPM external geant4-G4PhotonEvaporation 5.5
### RPM external geant4-G4PhotonEvaporation 5.7
%define G4RunTime G4LEVELGAMMADATA
%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4PhotonEvaporation.%{realversion}.tar.gz

## IMPORT geant4-data-rpm
3 changes: 2 additions & 1 deletion geant4-G4RadioactiveDecay.spec
View file
Open in desktop
@@ -1,5 +1,6 @@
### RPM external geant4-G4RadioactiveDecay 5.4
### RPM external geant4-G4RadioactiveDecay 5.6
%define G4RunTime G4RADIOACTIVEDATA
%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4RadioactiveDecay.%{realversion}.tar.gz

## IMPORT geant4-data-rpm

3 changes: 2 additions & 1 deletion geant4-G4RealSurface.spec
View file
Open in desktop
@@ -1,4 +1,5 @@
### RPM external geant4-G4RealSurface 2.1.1
### RPM external geant4-G4RealSurface 2.2
%define G4RunTime G4REALSURFACEDATA
%define source0 http://cmsrep.cern.ch/cmssw/download/geant4/G4RealSurface.%{realversion}.tar.gz

## IMPORT geant4-data-rpm
2 changes: 2 additions & 0 deletions geant4-toolfile.spec
View file
Open in desktop
Expand Up @@ -45,6 +45,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4core.xml
<runtime name="ROOT_INCLUDE_PATH" value="$INCLUDE" type="path"/>
<flags cppdefines="GNU_GCC G4V9"/>
<use name="clhep"/>
<use name="vecgeom"/>
<use name="zlib"/>
<use name="expat"/>
<use name="xerces-c"/>
Expand All @@ -62,6 +63,7 @@ cat << \EOF_TOOLFILE >%i/etc/scram.d/geant4static.xml
<environment name="LIBDIR" default="$GEANT4STATIC_BASE/lib/archive"/>
</client>
<use name="clhep"/>
<use name="vecgeom"/>
<use name="zlib"/>
<use name="expat"/>
<use name="xerces-c"/>
Expand Down
10 changes: 6 additions & 4 deletions geant4.spec
View file
Open in desktop
@@ -1,5 +1,5 @@
### RPM external geant4 10.6.10
%define tag 063863ea3f1f18807ab4dd51d8c03c56d80f1f41
### RPM external geant4 10.7.0rc1
%define tag a4e4079f1fe706a243a78ab2217ed28c44474700
%define branch cms/v%{realversion}
%define github_user cms-externals
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz
Expand All @@ -9,6 +9,7 @@ BuildRequires: cmake gmake
Requires: clhep
Requires: expat
Requires: xerces-c
Requires: vecgeom
Requires: zlib

%define keep_archives true
Expand All @@ -26,6 +27,7 @@ fi
rm -rf ../build
mkdir ../build
cd ../build
export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom

cmake ../%{n}.%{realversion} \
-DCMAKE_CXX_COMPILER="g++" \
Expand All @@ -46,13 +48,13 @@ cmake ../%{n}.%{realversion} \
-DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
-DGEANT4_ENABLE_TESTING=OFF \
-DGEANT4_BUILD_VERBOSE_CODE=OFF \
-DGEANT4_USE_USOLIDS-ADVANCED:INTERNAL=1 \
-DGEANT4_USE_USOLIDS="all" \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=ON \
-DGEANT4_INSTALL_EXAMPLES=OFF \
-DGEANT4_USE_SYSTEM_CLHEP=ON \
-DGEANT4_USE_SYSTEM_EXPAT=ON \
-DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT}" \
-DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \
-DGEANT4_USE_SYSTEM_ZLIB=ON \
-DGEANT4_BUILD_MULTITHREADED=ON

Expand Down