Skip to content

[Geant4] Update to 11.2.0 for G4VecGeom IBs #8878

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

Merged
smuzaffar merged 4 commits into from
Dec 20, 2023
Merged

[Geant4] Update to 11.2.0 for G4VecGeom IBs #8878

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fa1da66
[Geant4] Update to 11.2.0 for G4VecGeom IBs
smuzaffar Dec 13, 2023
0de0639
Update Vecgeom to 1.2.6
smuzaffar Dec 13, 2023
0ffce56
update g4 data package
smuzaffar Dec 13, 2023
b321781
vecgeom: update to version 1.2.7
smuzaffar Dec 19, 2023
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
2 changes: 1 addition & 1 deletion geant4-G4ABLA.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external geant4-G4ABLA 3.1
### RPM external geant4-G4ABLA 3.3
%define G4RunTime G4ABLADATA

## IMPORT geant4-data-rpm
2 changes: 1 addition & 1 deletion geant4-G4EMLOW.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external geant4-G4EMLOW 8.2
### RPM external geant4-G4EMLOW 8.5
%define G4RunTime G4LEDATA
%define source0 https://geant4-data.web.cern.ch/datasets/G4EMLOW.%{realversion}.tar.gz

Expand Down
2 changes: 1 addition & 1 deletion geant4-G4INCL.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external geant4-G4INCL 1.0
### RPM external geant4-G4INCL 1.2
%define G4RunTime G4INCLDATA

## IMPORT geant4-data-rpm
2 changes: 1 addition & 1 deletion geant4-G4NDL.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### RPM external geant4-G4NDL 4.6
### RPM external geant4-G4NDL 4.7
%define G4RunTime G4NEUTRONHPDATA

## IMPORT geant4-data-rpm
9 changes: 4 additions & 5 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
### RPM external geant4 11.2.cand02
### RPM external geant4 11.2.0
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard
%define tag ee28eac6629f74fc60a352c488a33837b09b55a2
%define tag 860a2b92bff1fbd70bc77cf7b43f8558634763b2
%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 Down Expand Up @@ -34,9 +34,6 @@ fi
rm -rf ../build
mkdir ../build
cd ../build
%if %{use_vecgeom}
export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom
%endif

cmake ../%{n}.%{realversion} \
-DCMAKE_CXX_COMPILER="g++" \
Expand All @@ -53,6 +50,8 @@ cmake ../%{n}.%{realversion} \
-DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \
%if %{use_vecgeom}
-DGEANT4_USE_USOLIDS="all" \
-DVecGeom_DIR=${VECGEOM_ROOT}/lib64/cmake/VecGeom \
-DVecCore_DIR=${VECGEOM_ROOT}/lib64/cmake/VecCore \
%endif
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=ON \
Expand Down
6 changes: 4 additions & 2 deletions vecgeom.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
### RPM external vecgeom v1.2.1
### RPM external vecgeom v1.2.7
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard
%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633
%define tag be99ff9e6b26fa5e0063f8bd21df23cb87911bf8
Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=master/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: cmake gmake
%define keep_archives true
%define vecgeom_backend Scalar
%define vecgeom_version %(echo %{realversion} | sed -e 's|^v||;s|-.*||')
Patch0: vecgeom-fix-vector

%define build_flags %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
Expand All @@ -22,6 +23,7 @@ mkdir ../build
cd ../build

cmake ../%{n}-%{realversion} \
-DVecGeom_GIT_DESCRIBE="%{vecgeom_version};;" \
-DCMAKE_INSTALL_PREFIX=%{i} \
-DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \
-DCMAKE_AR=$(which gcc-ar) \
Expand Down