From 6e6dda40aa7c32ce898cccf3610ac05fe2d86f17 Mon Sep 17 00:00:00 2001
From: Viktor <klochkov44@gmail.com>
Date: Mon, 24 Aug 2020 12:42:02 +0200
Subject: [PATCH] apply patch from Florian
---
external/InstallAnalysisTree.cmake | 4 +++-
external/InstallAnalysisTreeQA.cmake | 6 ++++--
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/external/InstallAnalysisTree.cmake b/external/InstallAnalysisTree.cmake
index 3179a253..83657983 100644
--- a/external/InstallAnalysisTree.cmake
+++ b/external/InstallAnalysisTree.cmake
@@ -1,4 +1,4 @@
-set(ANALYSISTREE_VERSION v1.0)
+set(ANALYSISTREE_VERSION v1.0.1)
set(ANALYSISTREE_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTree.git")
set(ANALYSISTREE_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREE-prefix")
@@ -33,6 +33,8 @@ ExternalProject_Add(ANALYSISTREE
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_STANDARD=11
-DROOTSYS=${SIMPATH}
+ -DBOOST_ROOT=${SIMPATH}
+ -DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
)
diff --git a/external/InstallAnalysisTreeQA.cmake b/external/InstallAnalysisTreeQA.cmake
index 96520291..2a0f3b6e 100644
--- a/external/InstallAnalysisTreeQA.cmake
+++ b/external/InstallAnalysisTreeQA.cmake
@@ -1,4 +1,4 @@
-set(ANALYSISTREEQA_VERSION v1.0)
+set(ANALYSISTREEQA_VERSION v1.0.1)
set(ANALYSISTREEQA_SRC_URL "https://github.com/HeavyIonAnalysis/AnalysisTreeQA.git")
set(ANALYSISTREEQA_DESTDIR "${CMAKE_BINARY_DIR}/external/ANALYSISTREEQA-prefix")
@@ -30,7 +30,9 @@ ExternalProject_Add(ANALYSISTREEQA
-DCMAKE_INSTALL_PREFIX=${CMAKE_BINARY_DIR}
-DCMAKE_CXX_STANDARD=11
-DROOTSYS=${SIMPATH}
- -DUSEBOOST=TRUE
+ -DUSEBOOST=TRUE
+ -DBOOST_ROOT=${SIMPATH}
+ -DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
INSTALL_COMMAND ${CMAKE_COMMAND} --build . --target install
)
--
GitLab