Last active
April 30, 2020 11:49
-
-
Save paulgessinger/1b3a683d3f9952b3f4be2da2eb65334b to your computer and use it in GitHub Desktop.
Backport of fixed to DD4hep 1.11.2
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/DDDigi/CMakeLists.txt b/DDDigi/CMakeLists.txt | |
index d6f26201..f8b522f7 100644 | |
--- a/DDDigi/CMakeLists.txt | |
+++ b/DDDigi/CMakeLists.txt | |
@@ -24,12 +24,10 @@ target_include_directories(DDDigi | |
FIND_PACKAGE(TBB QUIET) | |
if(TBB_FOUND) | |
- dd4hep_print( "|++> TBB_INCLUDE_DIR --> ${TBB_INCLUDE_DIR}") | |
- dd4hep_print( "|++> TBB_LIBRARY --> ${TBB_LIBRARY}") | |
+ dd4hep_print( "|++> TBB_IMPORTED_TARGETS --> ${TBB_IMPORTED_TARGETS}") | |
dd4hep_print( "|++> TBB found. DDDigi will run multi threaded.") | |
target_compile_definitions(DDDigi PUBLIC DD4HEP_USE_TBB) | |
- target_link_libraries(DDDigi ${TBB_LIBRARY}) | |
- target_include_directories(DDDigi ${TBB_INCLUDE_DIRS}) | |
+ target_link_libraries(DDDigi PUBLIC ${TBB_IMPORTED_TARGETS}) | |
else() | |
dd4hep_print( "|++> TBB not found. DDDigi will only work single threaded.") | |
endif() | |
diff --git a/DDDigi/src/DigiKernel.cpp b/DDDigi/src/DigiKernel.cpp | |
index c6924a14..8517188d 100644 | |
--- a/DDDigi/src/DigiKernel.cpp | |
+++ b/DDDigi/src/DigiKernel.cpp | |
@@ -91,7 +91,7 @@ public: | |
DigiAction* action = 0; | |
Wrapper(DigiContext& c, DigiAction* a) | |
: context(c), action(a) {} | |
- Wrapper(Wrapper&& copy) = delete; | |
+ Wrapper(Wrapper&& copy) = default; | |
Wrapper(const Wrapper& copy) = default; | |
Wrapper& operator=(Wrapper&& copy) = delete; | |
Wrapper& operator=(const Wrapper& copy) = delete; | |
@@ -111,7 +111,7 @@ class DigiKernel::Processor { | |
DigiKernel& kernel; | |
public: | |
Processor(DigiKernel& k) : kernel(k) {} | |
- Processor(Processor&& l) = delete; | |
+ Processor(Processor&& l) = default; | |
Processor(const Processor& l) = default; | |
void operator()() const { | |
int todo = 1; |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment