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

Unify geat4 deps and vecgeom selection #9464

Merged
merged 2 commits into from
Oct 16, 2024
Merged

Unify geat4 deps and vecgeom selection #9464

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
b975747
Unify geat4 deps and vecgeom selection
smuzaffar Oct 15, 2024
6875da8
Update celeritas.spec
smuzaffar Oct 15, 2024
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
17 changes: 3 additions & 14 deletions celeritas.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,11 @@
### RPM external celeritas v0.4.1
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard
## INCLUDE vecgeom-opt
%define keep_archives true
%define celeritas_gitversion %(echo %{realversion} | sed -e 's|^v||;s|-.*||')
%define tag f9b51d72fc268bf22c5560b82d3dd3d7613a8106
Source: git+https://github.com/celeritas-project/celeritas?obj=develop/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: cmake

%define build_flags -Wall -Wextra -pedantic %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
Requires: python3
Requires: json
Requires: geant4
Requires: expat xerces-c
%if %{enable_vecgeom}
Requires: vecgeom
%endif
%define package_build_flags -Wall -Wextra -pedantic
## INCLUDE geant4-deps
Requires: python3 json geant4

%prep
%setup -n %{n}-%{realversion}
Expand Down
12 changes: 3 additions & 9 deletions dd4hep.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,12 @@
### RPM external dd4hep v01-29-00
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard

%define tag d119e3f8f5da75bd87632467df088197f84ed1b8
%define branch master
%define github_user AIDASoft
%define keep_archives true

Source: git+https://github.com/%{github_user}/DD4hep.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
BuildRequires: cmake
Requires: root boost clhep xerces-c expat geant4
## INCLUDE geant4-deps

%define build_flags -fPIC %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
Requires: root boost geant4

%define cmake_fixed_args \\\
-DCMAKE_INSTALL_PREFIX='%{i}' \\\
Expand Down Expand Up @@ -40,7 +34,7 @@ export BOOST_ROOT

#Build normal Shared D4Hep without Geant4
rm -rf ../build; mkdir ../build; cd ../build
cmake %{cmake_fixed_args} -DBUILD_SHARED_LIBS=ON ../%{n}-%{realversion}
cmake %{cmake_fixed_args} -DBUILD_SHARED_LIBS=ON -DDD4HEP_USE_GEANT4=OFF ../%{n}-%{realversion}
make %{makeprocesses} VERBOSE=1
make install

Expand Down
10 changes: 2 additions & 8 deletions g4hepem.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,11 @@
### RPM external g4hepem 20230309
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
%define tag %{realversion}
%define branch master
%define github_user mnovak42
Source: git+https://github.com/%github_user/%{n}.git?obj=%{branch}/%{tag}&export=%{n}.%{realversion}&output=/%{n}.%{realversion}-%{tag}.tgz

BuildRequires: cmake gmake

Requires: geant4 expat xerces-c

%define keep_archives true
%define build_flags -fPIC %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
## INCLUDE geant4-deps
Requires: geant4

%prep
%setup -n %{n}.%{realversion}
Expand Down
16 changes: 16 additions & 0 deletions geant4-deps.file
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard
## INCLUDE vecgeom-opt

BuildRequires: cmake gmake
Requires: clhep
Requires: expat
Requires: xerces-c
%if %{enable_vecgeom}
Requires: vecgeom
%endif
Requires: zlib

%define keep_archives true
%define build_flags %{?package_build_flags} -fPIC %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
17 changes: 1 addition & 16 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
### RPM external geant4 11.2.2
## INCLUDE compilation_flags
## INCLUDE compilation_flags_lto
## INCLUDE cpp-standard
## INCLUDE vecgeom-opt
%define tag 95f4cebf4a63598d695070bf92e47355eef94a5f
%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

BuildRequires: cmake gmake

Requires: clhep
Requires: expat
Requires: xerces-c
%if %{enable_vecgeom}
Requires: vecgeom
%endif
Requires: zlib

%define keep_archives true
%define build_flags -fPIC %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags}
## INCLUDE geant4-deps

%prep
%setup -n %{n}.%{realversion}
Expand Down