From 4534ade5cbed62bceeed1898620cf8c7f66d7490 Mon Sep 17 00:00:00 2001 From: Frederik Date: Tue, 9 Jul 2024 14:00:43 +0200 Subject: [PATCH] Downstream configure and detray plugin cmake --- CMakeLists.txt | 6 +++--- Examples/Python/CMakeLists.txt | 10 +++------- Plugins/CMakeLists.txt | 2 +- Tests/DownstreamProject/CMakeLists.txt | 10 ++++++++-- 4 files changed, 15 insertions(+), 13 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2dfb80d58822..2f48b88c9c60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -152,9 +152,11 @@ set_option_if( set_option_if( ACTS_BUILD_PLUGIN_TGEO ACTS_BUILD_PLUGIN_DD4HEP OR ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING) +set_option_if(ACTS_BUILD_PLUGIN_TRACCC + ACTS_BUILD_EVERYTHING) set_option_if( ACTS_BUILD_PLUGIN_JSON - ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING) + ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING OR ACTS_BUILD_PLUGIN_TRACCC) set_option_if( ACTS_BUILD_FATRAS ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING) @@ -162,8 +164,6 @@ set_option_if(ACTS_BUILD_PLUGIN_LEGACY ACTS_BUILD_EVERYTHING) set_option_if(ACTS_BUILD_PLUGIN_EXATRKX ACTS_BUILD_EXAMPLES_EXATRKX) set_option_if(ACTS_BUILD_PLUGIN_FPEMON ACTS_BUILD_EXAMPLES OR ACTS_BUILD_EVERYTHING) -set_option_if(ACTS_BUILD_PLUGIN_TRACCC - ACTS_BUILD_EVERYTHING) # feature tests include(CheckCXXSourceCompiles) diff --git a/Examples/Python/CMakeLists.txt b/Examples/Python/CMakeLists.txt index 462bec058063..104359e236e7 100644 --- a/Examples/Python/CMakeLists.txt +++ b/Examples/Python/CMakeLists.txt @@ -84,13 +84,6 @@ else() target_sources(ActsPythonBindings PRIVATE src/GeoModelStub.cpp) endif() -if(ACTS_BUILD_PLUGIN_DETRAY) - target_link_libraries(ActsPythonBindings PUBLIC ActsPluginDetray) - target_sources(ActsPythonBindings PRIVATE src/Detray.cpp) -else() - target_sources(ActsPythonBindings PRIVATE src/DetrayStub.cpp) -endif() - if(ACTS_BUILD_PLUGIN_ACTSVG) target_link_libraries(ActsPythonBindings PUBLIC ActsExamplesIoSvg) target_sources(ActsPythonBindings PRIVATE src/Svg.cpp) @@ -207,8 +200,11 @@ endif() if(ACTS_BUILD_PLUGIN_TRACCC) target_link_libraries(ActsPythonBindings PUBLIC ActsPluginCovfie) target_sources(ActsPythonBindings PRIVATE src/Covfie.cpp) + target_link_libraries(ActsPythonBindings PUBLIC ActsPluginDetray) + target_sources(ActsPythonBindings PRIVATE src/Detray.cpp) else() target_sources(ActsPythonBindings PRIVATE src/CovfieStub.cpp) + target_sources(ActsPythonBindings PRIVATE src/DetrayStub.cpp) endif() configure_file(setup.sh.in ${_python_dir}/setup.sh @ONLY) diff --git a/Plugins/CMakeLists.txt b/Plugins/CMakeLists.txt index 996cbf8463a1..c4007d63dad3 100644 --- a/Plugins/CMakeLists.txt +++ b/Plugins/CMakeLists.txt @@ -10,7 +10,7 @@ add_component_if(Json PluginJson ACTS_BUILD_PLUGIN_JSON) add_component_if(Legacy PluginLegacy ACTS_BUILD_PLUGIN_LEGACY) add_component_if(Onnx PluginOnnx ACTS_BUILD_PLUGIN_ONNX) add_component_if(ExaTrkX PluginExaTrkX ACTS_BUILD_PLUGIN_EXATRKX) -add_component_if(Detray PluginDetray ACTS_BUILD_PLUGIN_DETRAY) +add_component_if(Detray PluginDetray ACTS_BUILD_PLUGIN_TRACCC) add_component_if(Covfie PluginCovfie ACTS_BUILD_PLUGIN_TRACCC) # dependent plugins. depend either on a independent plugins or on one another diff --git a/Tests/DownstreamProject/CMakeLists.txt b/Tests/DownstreamProject/CMakeLists.txt index f6901184ac77..91a9fc1dd4b8 100644 --- a/Tests/DownstreamProject/CMakeLists.txt +++ b/Tests/DownstreamProject/CMakeLists.txt @@ -10,7 +10,10 @@ find_package( Fatras PluginJson PluginLegacy - PluginTGeo) + PluginTGeo + PluginCovfie + PluginDetray + PluginTraccc) # place artifacts in GNU-like paths, e.g. binaries in `/bin` include(GNUInstallDirs) @@ -27,7 +30,10 @@ target_link_libraries( ActsFatras ActsPluginJson ActsPluginLegacy - ActsPluginTGeo) + ActsPluginTGeo + ActsPluginCovfie + ActsPluginDetray + ActsPluginTraccc) option(DD4HEP "Build with DD4hep" ON) if(DD4HEP)