Merge pull request #10711 from cms-sw/vecgeom-2.1.0

Vecgeom: Update to version v2.1.0

Author: smuzaffar

celeritas.spec

@@ -1,12 +1,15 @@
-### RPM external celeritas 0.6.3
-Source: https://github.com/celeritas-project/celeritas/releases/download/v%{realversion}/celeritas-%{realversion}.tar.gz
+### RPM external celeritas 0.7.0-devX
+%define tag 1fb77992ff4a8b6da8cc8d8630df3727a3c33cf3
+%define branch develop
+%define github_user celeritas-project
+Source: git+https://github.com/%{github_user}/celeritas.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}-%{tag}.tgz
 
 %define package_build_flags -Wall -Wextra -pedantic
 ## INCLUDE geant4-deps
 Requires: python3 json geant4 g4vg
 
 %prep
-%setup -c -n %{n}-%{realversion}
+%setup -n %{n}-%{realversion}
 
 %build
 

vecgeom-fix-vector.patch

@@ -1,18 +1,9 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dad4bdc..2886ead 100644
+index 2db3a68..5363894 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -17,7 +17,7 @@ include(ExternalProject)
+@@ -127,7 +127,7 @@ option(VECGEOM_SANITIZER "Enable memory sanitizer." OFF)
 
- # Set VecGeom_VERSION using git tags or release metadata
- include("${CMAKE_CURRENT_LIST_DIR}/cmake/CgvFindVersion.cmake")
--cgv_find_version(VecGeom)
-+#cgv_find_version(VecGeom)
- message(STATUS "VecGeom version string: ${VecGeom_VERSION_STRING}")
-
- project(VecGeom
-@@ -111,7 +111,7 @@ option(VECGEOM_SANITIZER "Enable memory sanitizer." OFF)
-
  set(VECGEOM_ISAS empty)
  if(CMAKE_SYSTEM_PROCESSOR MATCHES "(i686|x86_64)")
 -  set(VECGEOM_ISAS sse2 sse3 ssse3 sse4.1 sse4.2 avx avx2 native empty)

vecgeom.spec

@@ -1,10 +1,10 @@
-### RPM external vecgeom v2.0.0
+### RPM external vecgeom 2.1.0
 ## INCLUDE compilation_flags
 ## INCLUDE compilation_flags_lto
 ## INCLUDE cpp-standard
 ## INCLUDE microarch_flags
 
-%define tag %{realversion}
+%define tag v%{realversion}
 %define branch master
 Source: git+https://gitlab.cern.ch/VecGeom/VecGeom.git?obj=%{branch}/%{tag}&export=%{n}-%{realversion}&output=/%{n}-%{realversion}.tgz
 Patch0: vecgeom-fix-vector
@@ -18,6 +18,8 @@ Requires: xerces-c
 %prep
 %setup -n %{n}-%{realversion}
 %patch0 -p1
+grep -q 'set(VecGeom_VERSION\s*' CMakeLists.txt
+sed -i -e 's|set(VecGeom_VERSION *.*|set(VecGeom_VERSION %{realversion})|' CMakeLists.txt
 
 %build
 %ifarch x86_64
@@ -34,7 +36,6 @@ cmake ../%{n}-%{realversion} \
   -DVecGeom_GIT_DESCRIBE="%{vecgeom_version};;" \
   -DCMAKE_INSTALL_PREFIX=%{i} \
   -DBUILD_TESTING=OFF \
-  -DVecGeom_VERSION=%{vecgeom_version} \
   -DCMAKE_CXX_STANDARD:STRING="%{cms_cxx_standard}" \
   -DCMAKE_AR=$(which gcc-ar) \
   -DCMAKE_RANLIB=$(which gcc-ranlib) \