diff --git a/geant4.spec b/geant4.spec index f33187bfdb7..e6a8336cee5 100644 --- a/geant4.spec +++ b/geant4.spec @@ -49,9 +49,9 @@ cmake ../%{n}.%{realversion} \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_INSTALL_PREFIX:PATH="%i" \ + -DCMAKE_CXX_STANDARD:STRING="17" \ -DCMAKE_BUILD_TYPE=Release \ -DGEANT4_USE_GDML=ON \ - -DGEANT4_BUILD_CXXSTD:STRING="17" \ -DGEANT4_BUILD_TLS_MODEL:STRING="global-dynamic" \ -DGEANT4_ENABLE_TESTING=OFF \ -DGEANT4_BUILD_VERBOSE_CODE=OFF \ @@ -64,7 +64,7 @@ cmake ../%{n}.%{realversion} \ -DGEANT4_INSTALL_EXAMPLES=OFF \ -DGEANT4_USE_SYSTEM_CLHEP=ON \ -DGEANT4_USE_SYSTEM_EXPAT=ON \ - -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \ + -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT};${VECCORE_ROOT}" \ -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DGEANT4_BUILD_MULTITHREADED=ON diff --git a/scram-tools.file/tools/veccore/veccore.xml b/scram-tools.file/tools/veccore/veccore.xml new file mode 100644 index 00000000000..354964193d7 --- /dev/null +++ b/scram-tools.file/tools/veccore/veccore.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/scram-tools.file/tools/vecgeom/vecgeom.xml b/scram-tools.file/tools/vecgeom/vecgeom.xml index d66a3f63229..ecae7d0d7c1 100644 --- a/scram-tools.file/tools/vecgeom/vecgeom.xml +++ b/scram-tools.file/tools/vecgeom/vecgeom.xml @@ -3,7 +3,7 @@ - + diff --git a/veccore.spec b/veccore.spec new file mode 100644 index 00000000000..18558d911fa --- /dev/null +++ b/veccore.spec @@ -0,0 +1,30 @@ +### RPM external veccore 0.8.0 +## INCLUDE compilation_flags +Source: https://github.com/root-project/veccore/archive/refs/tags/v%{realversion}.tar.gz + +BuildRequires: cmake gmake + +%prep +%setup -n %{n}-%{realversion} + +%build +rm -rf ../build +mkdir ../build +cd ../build + +cmake ../%{n}-%{realversion} \ + -DCMAKE_INSTALL_PREFIX:PATH="%i" \ +%if "%{?arch_build_flags}" + -DCMAKE_CXX_FLAGS="%{arch_build_flags}" \ +%endif + -DCMAKE_BUILD_TYPE=Release + +make %{makeprocesses} + +%install +cd ../build +make %{makeprocesses} install + +%post +%{relocateConfig}lib/cmake/VecCore/*.cmake + diff --git a/vecgeom.spec b/vecgeom.spec index e5cc9886e55..7e5112c0e6f 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,10 +1,10 @@ -### 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 - +%define vecgeom_backend Scalar Patch0: vecgeom-fix-vector %prep @@ -19,24 +19,28 @@ cd ../build cmake ../%{n}-%{realversion} \ -DCMAKE_INSTALL_PREFIX=%{i} \ - -DCMAKE_INSTALL_LIBDIR=%{i}/lib \ + -DCMAKE_CXX_STANDARD:STRING="17" \ -DROOT=OFF \ -DCMAKE_AR=$(which gcc-ar) \ -DCMAKE_RANLIB=$(which gcc-ranlib) \ -DCMAKE_BUILD_TYPE=Release \ -DNO_SPECIALIZATION=ON \ - -DBACKEND=Scalar \ + -DBUILTIN_VECCORE=ON \ + -DBACKEND=%{vecgeom_backend} \ %ifarch x86_64 +%if "%{vecgeom_backend}" == "Vc" -DVECGEOM_VECTOR=sse3 \ +%endif %endif -DCMAKE_VERBOSE_MAKEFILE=TRUE \ -DCMAKE_CXX_STANDARD=17 \ %if "%{?arch_build_flags}" -DCMAKE_CXX_FLAGS="%{arch_build_flags}" \ %endif - -DGEANT4=OFF + -DGEANT4=OFF \ + -DDATA_DOWNLOAD=OFF -make %{makeprocesses} +make %{makeprocesses} VERBOSE=1 %install cd ../build