Skip to content
Snippets Groups Projects
Commit 0212607e authored by Moritz Kiehn's avatar Moritz Kiehn
Browse files

Merge branch 'ACTS-101_enableRootThreadSafety' into 'master'

ACTS-101_enableRootThreadSafety

Closes ACTSFW-101

See merge request acts/acts-framework!86
parents ad579823 4defecbc
No related branches found
No related tags found
No related merge requests found
...@@ -2,7 +2,9 @@ file(GLOB_RECURSE src_files "src/*.cpp" "include/*.*pp") ...@@ -2,7 +2,9 @@ file(GLOB_RECURSE src_files "src/*.cpp" "include/*.*pp")
add_library(ACTFramework SHARED ${src_files}) 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 $<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 ACTS::ACTSCore)
target_link_libraries(ACTFramework PUBLIC ${ROOT_LIBRARIES})
install(TARGETS ACTFramework LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(TARGETS ACTFramework LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
install(DIRECTORY include/ACTFW DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) install(DIRECTORY include/ACTFW DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
...@@ -7,16 +7,16 @@ ...@@ -7,16 +7,16 @@
// file, You can obtain one at http://mozilla.org/MPL/2.0/. // file, You can obtain one at http://mozilla.org/MPL/2.0/.
#include "ACTFW/Framework/Sequencer.hpp" #include "ACTFW/Framework/Sequencer.hpp"
#include <algorithm> #include <algorithm>
#include "ACTFW/Concurrency/parallel_for.hpp" #include "ACTFW/Concurrency/parallel_for.hpp"
#include "ACTFW/Framework/WhiteBoard.hpp" #include "ACTFW/Framework/WhiteBoard.hpp"
#include "TROOT.h"
FW::Sequencer::Sequencer(const Sequencer::Config& cfg, FW::Sequencer::Sequencer(const Sequencer::Config& cfg,
std::unique_ptr<const Acts::Logger> logger) std::unique_ptr<const Acts::Logger> logger)
: m_cfg(cfg), m_logger(std::move(logger)) : m_cfg(cfg), m_logger(std::move(logger))
{ {
ROOT::EnableThreadSafety();
} }
FW::ProcessCode FW::ProcessCode
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment