diff --git a/geant4.spec b/geant4.spec index f65ec0ff883..9805cd35d54 100644 --- a/geant4.spec +++ b/geant4.spec @@ -34,9 +34,6 @@ fi rm -rf ../build mkdir ../build cd ../build -%if %{use_vecgeom} -export VecGeom_DIR=${VECGEOM_ROOT}/lib/cmake/VecGeom -%endif cmake ../%{n}.%{realversion} \ -DCMAKE_CXX_COMPILER="g++" \ @@ -59,6 +56,10 @@ cmake ../%{n}.%{realversion} \ -DGEANT4_INSTALL_EXAMPLES=OFF \ -DGEANT4_USE_SYSTEM_CLHEP=ON \ -DGEANT4_USE_SYSTEM_EXPAT=ON \ +%if %{use_vecgeom} + -DVecGeom_DIR=${VECGEOM_ROOT}/lib64/cmake/VecGeom \ + -DVecCore_DIR=${VECGEOM_ROOT}/lib64/cmake/VecCore \ +%endif -DCMAKE_PREFIX_PATH="${XERCES_C_ROOT};${CLHEP_ROOT};${EXPAT_ROOT};${ZLIB_ROOT};${VECGEOM_ROOT}" \ -DGEANT4_USE_SYSTEM_ZLIB=ON \ -DGEANT4_BUILD_MULTITHREADED=ON diff --git a/scram-tools.file/tools/vecgeom/vectorized.tmpl b/scram-tools.file/tools/vecgeom/vectorized.tmpl index cb4880d41c2..59814517c26 100644 --- a/scram-tools.file/tools/vecgeom/vectorized.tmpl +++ b/scram-tools.file/tools/vecgeom/vectorized.tmpl @@ -1,5 +1,5 @@ - + diff --git a/vecgeom.spec b/vecgeom.spec index f64e3a0ecb9..90106e5681f 100644 --- a/vecgeom.spec +++ b/vecgeom.spec @@ -1,12 +1,13 @@ -### RPM external vecgeom v1.2.1 +### RPM external vecgeom v1.2.7 ## INCLUDE compilation_flags ## INCLUDE compilation_flags_lto ## INCLUDE cpp-standard -%define tag 12fc8ba12efe93de5aaa9ff8e51e093ae93a1633 +%define tag be99ff9e6b26fa5e0063f8bd21df23cb87911bf8 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 +%define vecgeom_version %(echo %{realversion} | sed -e 's|^v||;s|-.*||') Patch0: vecgeom-fix-vector %define build_flags %{?arch_build_flags} %{?lto_build_flags} %{?pgo_build_flags} @@ -22,6 +23,7 @@ mkdir ../build cd ../build cmake ../%{n}-%{realversion} \ + -DVecGeom_GIT_DESCRIBE="%{vecgeom_version};;" \ -DCMAKE_INSTALL_PREFIX=%{i} \ -DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \ -DCMAKE_AR=$(which gcc-ar) \ @@ -49,3 +51,7 @@ make %{makeprocesses} VERBOSE=1 %install cd ../build make %{makeprocesses} install VERBOSE=1 +sed -i -e 's|set(VecCore_DIR .*|set(VecCore_DIR "%{i}/lib64/cmake/VecCore")|' %{i}/lib64/cmake/VecGeom/VecGeomConfig.cmake + +%post +%{relocateConfig}lib64/cmake/VecGeom/VecGeomConfig.cmake