Skip to content

Update vecgeom to 1.1.20 #7735

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 21 commits into from
May 4, 2022
Merged

Update vecgeom to 1.1.20 #7735

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
b91f4bb
Update vecgeom.spec
iarspider Mar 31, 2022
8adc016
Update geant4.spec
iarspider Mar 31, 2022
b5fcbc5
Revert "Update geant4.spec"
iarspider Mar 31, 2022
4dd9086
Add veccore; use veccore in vecgeom
iarspider Mar 31, 2022
5dbdaf1
Proper naming
iarspider Mar 31, 2022
42eb02a
Revert "Proper naming"
iarspider Mar 31, 2022
c516b73
Make lowercase
iarspider Mar 31, 2022
95f63ac
Fix recipes
iarspider Mar 31, 2022
fff5596
Fix geant spec
iarspider Mar 31, 2022
5279129
Add toolfile for veccore and use it in vecgeom
iarspider Mar 31, 2022
e4c2a0f
there is no library fro veccore, it is source only package
smuzaffar Mar 31, 2022
d41ea52
Update vecgeom.spec
smuzaffar Apr 1, 2022
cc0fc6b
typo
smuzaffar Apr 1, 2022
048d35c
vecgeom: in scalar mode do not set DVECGEOM_VECTOR
smuzaffar Apr 5, 2022
59f53b0
set -DG4GEOM_USE_USOLIDS
smuzaffar Apr 13, 2022
eaf47af
Update geant4static.xml
smuzaffar Apr 14, 2022
1d160b8
Merge branch 'IB/CMSSW_12_4_X/geant4_vecgeom' into update-vecgeom-1.1.20
smuzaffar Apr 14, 2022
31a2f60
try using buildin veccore
smuzaffar May 2, 2022
42f5258
Merge branch 'IB/CMSSW_12_4_X/geant4_vecgeom' into update-vecgeom-1.1.20
smuzaffar May 2, 2022
215b536
Merge branch 'IB/CMSSW_12_4_X/geant4_vecgeom' into update-vecgeom-1.1.20
smuzaffar May 3, 2022
c43fa21
build vecgeom with c++17
smuzaffar May 3, 2022
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: 0 additions & 1 deletion geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ cmake ../%{n}.%{realversion} \
-DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
-DGEANT4_ENABLE_TESTING=OFF \
-DGEANT4_BUILD_VERBOSE_CODE=OFF \
-DGEANT4_BUILD_BUILTIN_BACKTRACE=OFF \
-DGEANT4_USE_USOLIDS="all" \
-DBUILD_SHARED_LIBS=ON \
-DBUILD_STATIC_LIBS=ON \
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,6 +1,6 @@
### RPM external vecgeom v1.1.18
### RPM external vecgeom v1.1.20
## INCLUDE compilation_flags
%define tag 0afdb8f87dbf1293a4a46b5efa3fe03dd345d302
%define tag ccc45b15420e60f39b60107795a85fed12332005
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
Expand All @@ -24,7 +24,6 @@ cmake ../%{n}-%{realversion} \
-DCMAKE_BUILD_TYPE=Release \
-DNO_SPECIALIZATION=ON \
-DBACKEND=Scalar \
-DGEANT4_USE_USOLIDS="CONS;POLYCONE;POLYHEDRA" \
%ifarch x86_64
-DVECGEOM_VECTOR=sse3 \
%endif
Expand Down