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

[G4VECGEOM] Update clhep to 2.4.6.0, vecgeom to 1.2.1 #8211

Merged
merged 6 commits into from
Dec 7, 2022
Merged

[G4VECGEOM] Update clhep to 2.4.6.0, vecgeom to 1.2.1 #8211

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d98132b
Update clhep to 2.4.6.0
iarspider Nov 30, 2022
497e2e1
Update vecgeom to 1.2.1
iarspider Nov 30, 2022
94894c4
build vecgeom with -O2,
smuzaffar Dec 6, 2022
532ec9d
set vecgeom release flags to -O2 -DNDEBUG
smuzaffar Dec 6, 2022
2049e79
build dd4hep and gean4 with -O2 -DNDEBUG
smuzaffar Dec 6, 2022
7efc76b
improve dd4hep cmake flags
smuzaffar Dec 6, 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
4 changes: 2 additions & 2 deletions clhep.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### RPM external clhep 2.4.5.1
### RPM external clhep 2.4.6.0

%define tag f256fe37039681f7856f0e324ccf9337cdc35b51
%define tag 06b39fc5f06924728af27f6b0df1ffdac174dff3
%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}.tgz
Expand Down
25 changes: 14 additions & 11 deletions dd4hep.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,35 @@ Source: git+https://github.com/%{github_user}/DD4hep.git?obj=%{branch}/%{tag}&ex
BuildRequires: cmake
Requires: root boost clhep xerces-c geant4

%define cmake_fixed_args \\\
-DCMAKE_INSTALL_PREFIX='%{i}' \\\
-DBoost_NO_BOOST_CMAKE=ON \\\
-DDD4HEP_USE_XERCESC=ON \\\
-DDD4HEP_USE_PYROOT=ON \\\
-DCMAKE_CXX_STANDARD=17 \\\
-DCMAKE_BUILD_TYPE=Release \\\
-DCMAKE_CXX_FLAGS_RELEASE='-O2 -DNDEBUG' \\\
-DDD4HEP_USE_GEANT4_UNITS=ON \\\
-DXERCESC_ROOT_DIR=${XERCES_C_ROOT} \\\
-DCMAKE_PREFIX_PATH="${CLHEP_ROOT};${XERCES_C_ROOT}"

%prep

%setup -n %{n}-%{realversion}

%build

export BOOST_ROOT
CMAKE_ARGS="-DCMAKE_INSTALL_PREFIX='%{i}' \
-DBoost_NO_BOOST_CMAKE=ON \
-DDD4HEP_USE_XERCESC=ON \
-DXERCESC_ROOT_DIR=${XERCES_C_ROOT} \
-DDD4HEP_USE_PYROOT=ON \
-DCMAKE_CXX_STANDARD=17 \
-DCMAKE_BUILD_TYPE=Release \
-DDD4HEP_USE_GEANT4_UNITS=ON \
-DCMAKE_PREFIX_PATH=${CLHEP_ROOT};${XERCES_C_ROOT}"

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

#Building DDG4 static
rm -rf ../build-g4; mkdir ../build-g4; cd ../build-g4
cmake $CMAKE_ARGS -DBUILD_SHARED_LIBS=OFF -DDD4HEP_USE_GEANT4=ON ../%{n}-%{realversion}
cmake %{cmake_fixed_args} -DBUILD_SHARED_LIBS=OFF -DDD4HEP_USE_GEANT4=ON ../%{n}-%{realversion}
cd DDG4
make %{makeprocesses} VERBOSE=1
for lib in $(ls ../lib/libDDG4*.a | sed 's|.a$||'); do
Expand Down
1 change: 1 addition & 0 deletions geant4.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ cmake ../%{n}.%{realversion} \
-DCMAKE_INSTALL_PREFIX:PATH="%i" \
-DCMAKE_CXX_STANDARD:STRING="17" \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \
-DGEANT4_USE_GDML=ON \
-DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \
-DGEANT4_ENABLE_TESTING=OFF \
Expand Down
5 changes: 3 additions & 2 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.2.0
### RPM external vecgeom v1.2.1
## INCLUDE compilation_flags
%define tag 14d3a5c3d851794da4ca48d7659980dbf73384d4
%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633
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 @@ -23,6 +23,7 @@ cmake ../%{n}-%{realversion} \
-DCMAKE_AR=$(which gcc-ar) \
-DCMAKE_RANLIB=$(which gcc-ranlib) \
-DCMAKE_BUILD_TYPE=Release \
-DCMAKE_CXX_FLAGS_RELEASE="-O2 -DNDEBUG" \
-DCMAKE_VERBOSE_MAKEFILE=TRUE \
%if "%{?arch_build_flags}"
-DCMAKE_CXX_FLAGS="%{arch_build_flags}" \
Expand Down