From 8d92203a7ae59c54302231b82431d5f69f9b06b2 Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Thu, 27 Aug 2020 19:25:58 +0200
Subject: [PATCH] Fix AnalysisTree and AnalysisTreeQA installation
Use commit hash of a tag instead of tag name to define the needed git version.
The hash is needed to check the already downloaded and build version.
Without the hash after each run of CMake the libraries are rebuild.
Using the hash only rebuild the libraries if there is a change of the hash.
---
external/InstallAnalysisTree.cmake | 8 ++++----
external/InstallAnalysisTreeQA.cmake | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/external/InstallAnalysisTree.cmake b/external/InstallAnalysisTree.cmake
index eb8bf8db55..0d29296594 100644
--- a/external/InstallAnalysisTree.cmake
+++ b/external/InstallAnalysisTree.cmake
@@ -1,4 +1,4 @@
-set(ANALYSISTREE_VERSION v1.0.1)
+set(ANALYSISTREE_VERSION 6152da7130f711a4a6459bc758bb49b858922fa8)
set(ANALYSISTREE_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTree.git")
set(ANALYSISTREE_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREE-prefix")
@@ -54,9 +54,9 @@ set(AnalysisTree_FOUND TRUE)
foreach(LIB_NAME ${ANALYSISTREE_LIBNAME})
Install( FILES
- "${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}"
- "${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}_rdict.pcm"
- "${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}.rootmap"
+ ${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}${CMAKE_SHARED_LIBRARY_SUFFIX}
+ ${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}_rdict.pcm
+ ${CMAKE_BINARY_DIR}/lib/${CMAKE_SHARED_LIBRARY_PREFIX}${LIB_NAME}.rootmap
DESTINATION lib)
endforeach(LIB_NAME)
diff --git a/external/InstallAnalysisTreeQA.cmake b/external/InstallAnalysisTreeQA.cmake
index 43297b305b..797633641a 100644
--- a/external/InstallAnalysisTreeQA.cmake
+++ b/external/InstallAnalysisTreeQA.cmake
@@ -1,4 +1,4 @@
-set(ANALYSISTREEQA_VERSION v1.0.1)
+set(ANALYSISTREEQA_VERSION 634a0200ba4110eb31328c327a462d11f96f7e14)
set(ANALYSISTREEQA_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTreeQA.git")
set(ANALYSISTREEQA_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREEQA-prefix")
--
GitLab