From 4defecbc3a4cf9f630fcc24eef5b4de9f1b33c7d Mon Sep 17 00:00:00 2001
From: jhrdinka <julia.hrdinka@cern.ch>
Date: Tue, 12 Dec 2017 10:42:28 +0100
Subject: [PATCH] enable thread safety in root
---
Core/CMakeLists.txt | 2 ++
Core/src/Framework/Sequencer.cpp | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/Core/CMakeLists.txt b/Core/CMakeLists.txt
index 2a5eeaf3..a6058967 100644
--- a/Core/CMakeLists.txt
+++ b/Core/CMakeLists.txt
@@ -2,7 +2,9 @@ file(GLOB_RECURSE src_files "src/*.cpp" "include/*.*pp")
add_library(ACTFramework SHARED ${src_files})
target_include_directories (ACTFramework PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include/> $<INSTALL_INTERFACE:include>)
+target_include_directories(ACTFramework PUBLIC ${ROOT_INCLUDE_DIRS})
target_link_libraries(ACTFramework PUBLIC ACTS::ACTSCore)
+target_link_libraries(ACTFramework PUBLIC ${ROOT_LIBRARIES})
install(TARGETS ACTFramework LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(DIRECTORY include/ACTFW DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/Core/src/Framework/Sequencer.cpp b/Core/src/Framework/Sequencer.cpp
index 8bfa20fc..419813a1 100644
--- a/Core/src/Framework/Sequencer.cpp
+++ b/Core/src/Framework/Sequencer.cpp
@@ -7,16 +7,16 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "ACTFW/Framework/Sequencer.hpp"
-
#include <algorithm>
-
#include "ACTFW/Concurrency/parallel_for.hpp"
#include "ACTFW/Framework/WhiteBoard.hpp"
+#include "TROOT.h"
FW::Sequencer::Sequencer(const Sequencer::Config& cfg,
std::unique_ptr<const Acts::Logger> logger)
: m_cfg(cfg), m_logger(std::move(logger))
{
+ ROOT::EnableThreadSafety();
}
FW::ProcessCode
--
GitLab