From d7e606fbd69776ff77f0ae373abd8426d141cba9 Mon Sep 17 00:00:00 2001
From: Johannes Elmsheuser <johannes.elmsheuser@cern.ch>
Date: Tue, 2 Jul 2024 14:59:29 +0200
Subject: [PATCH] Add patch for ROOT version setting in cmake

---
 External/ROOT/CMakeLists.txt               |  2 +-
 External/ROOT/patches/v6-32-02-cmake.patch | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)
 create mode 100644 External/ROOT/patches/v6-32-02-cmake.patch

diff --git a/External/ROOT/CMakeLists.txt b/External/ROOT/CMakeLists.txt
index 317ba365..5fa1179c 100644
--- a/External/ROOT/CMakeLists.txt
+++ b/External/ROOT/CMakeLists.txt
@@ -27,7 +27,7 @@ mark_as_advanced( ATLAS_ROOT_SOURCE )
 
 # Decide whether / how to patch the ROOT sources.
 set( ATLAS_ROOT_PATCH
-   "PATCH_COMMAND;patch;-p1;-i;${CMAKE_CURRENT_SOURCE_DIR}/patches/v6-28-04-vdt.patch;COMMAND;patch;-p1;-i;${CMAKE_CURRENT_SOURCE_DIR}/patches/v6-32-00-cmake.patch"
+   "PATCH_COMMAND;patch;-p1;-i;${CMAKE_CURRENT_SOURCE_DIR}/patches/v6-28-04-vdt.patch;COMMAND;patch;-p1;-i;${CMAKE_CURRENT_SOURCE_DIR}/patches/v6-32-00-cmake.patch;COMMAND;patch;-p1;-i;${CMAKE_CURRENT_SOURCE_DIR}/patches/v6-32-02-cmake.patch"
    CACHE STRING "Patch command for ROOT" )
 set( ATLAS_ROOT_FORCEDOWNLOAD_MESSAGE
    "Forcing the re-download of ROOT (2023.07.26.)"
diff --git a/External/ROOT/patches/v6-32-02-cmake.patch b/External/ROOT/patches/v6-32-02-cmake.patch
new file mode 100644
index 00000000..56d25e08
--- /dev/null
+++ b/External/ROOT/patches/v6-32-02-cmake.patch
@@ -0,0 +1,11 @@
+--- ROOT/cmake/modules/SetROOTVersion.cmake	2024-07-02 14:36:07.043897305 +0200
++++ ROOT/cmake/modules/SetROOTVersion.cmake	2024-07-02 14:40:09.134203758 +0200
+@@ -39,7 +39,7 @@
+                     ERROR_QUIET
+                     OUTPUT_STRIP_TRAILING_WHITESPACE)
+   else()
+-    set(GIT_DESCRIBE_ERRCODE "NoGit")
++    set(GIT_DESCRIBE_ALL "tags/v6-32-02")
+   endif()
+ 
+   SET_VERSION_FROM_FILE()
-- 
GitLab