Update LCIo and dd4hep

andriish · Jan 17, 2025 · 0847de0 · 0847de0
1 parent ec9a0b8
commit 0847de0
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/DD4hep/01.30.00/DD4hep.spec b/DD4hep/01.30.00/DD4hep.spec
@@ -1,6 +1,6 @@
 Name:           DD4hep
 Version:        01.30.00
-Release:        7%{?dist}
+Release:        8%{?dist}
 Summary:        DD4hep (Detector Description for High Energy Physics)
 Group:          Development/Tools
 License:        Custom
@@ -36,6 +36,7 @@ Requires:         root HepMC3 python tbb python3
 BuildRequires:    geant4-devel
 BuildRequires:    root root-core root-graf3d-eve root-graf3d-eve7 root-genvector root-geom root-gui root-mathcore root-mathmore root-tree root-physics root-gdml root-graf3d root-tpython  	root-gui-browserv7
 BuildRequires:    HepMC3-devel  HepMC3  python3  python3-devel boost-devel boost-filesystem tbb tbb-devel expat-devel xerces-c-devel
+Requires: geant4-devel expat-devel xerces-c-devel
 %endif
 
 Prefix: %{_prefix}

diff --git a/DD4hep/01.30.00/PATCHED/cmake/DD4hep.cmake b/DD4hep/01.30.00/PATCHED/cmake/DD4hep.cmake
@@ -9,6 +9,7 @@
 # For the list of contributors see $DD4hepINSTALL/doc/CREDITS.
 #
 #=================================================================================
+include("GNUInstallDirs")
 
 #---------------------------------------------------------------------------------------------------
 if ( DD4hep_DIR )

diff --git a/LCIO/02.22.02/LCIO.spec b/LCIO/02.22.02/LCIO.spec
@@ -1,6 +1,6 @@
 Name:           LCIO
 Version:        2.22.02
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        LCIO (Linear Collider I/O) is a persistency framework and event data model for linear collider detector studies.
 
 Group:          Development/Tools
@@ -97,12 +97,14 @@ sed  -i 's/python -c/python3 -c/g' tests/CMakeLists.txt
 %cmake_install
 mkdir -p $RPM_BUILD_ROOT/%{python3_sitearch}
 mv $RPM_BUILD_ROOT/usr/python/* $RPM_BUILD_ROOT/%{python3_sitearch}
+cp $RPM_BUILD_ROOT/%{_libdir}/cmake/SIO/*cmake $RPM_BUILD_ROOT/%{_libdir}/cmake/LCIO/
 %endif
 
 %if  0%{?suse_version}
 %cmake_install
 mkdir -p $RPM_BUILD_ROOT/%{python_sitearch}
 mv $RPM_BUILD_ROOT/usr/python/* $RPM_BUILD_ROOT/%{python_sitearch}
+cp $RPM_BUILD_ROOT/%{_libdir}/cmake/SIO/*cmake $RPM_BUILD_ROOT/%{_libdir}/cmake/LCIO/
 %endif
 
 %post -p /sbin/ldconfig

diff --git a/alllocal.sh b/alllocal.sh
@@ -4,8 +4,8 @@ export PATH=$PATH:$(pwd)
 
 #set -x 
 declare -a BUILDLIST=(
-LoopTools:2.16
-#DD4hep:01.30.00
+#LoopTools:2.16
+DD4hep:01.30.00
 #geant4:11.3.0
 #LCIO:02.22.02
 #whizard:3.1.5