Skip to content

Commit

Permalink
changes
Browse files Browse the repository at this point in the history
  • Loading branch information
fredevb committed Jul 28, 2024
1 parent e32b12f commit 8cf392a
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 15 deletions.
2 changes: 0 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -301,8 +301,6 @@ endmacro()
# the same package twice. This avoids having complex if/else trees to sort out
# when a particular package is actually needed.

add_definitions(-DALGEBRA_PLUGINS_INCLUDE_ARRAY)

# plugin dependencies

if(ACTS_BUILD_PLUGIN_ACTSVG)
Expand Down
1 change: 0 additions & 1 deletion Plugins/Traccc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ target_link_libraries(
PUBLIC
ActsCore
traccc::core
traccc::io
vecmem::core
detray::utils
detray::io
Expand Down
6 changes: 4 additions & 2 deletions Tests/DownstreamProject/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ find_package(
PluginLegacy
PluginTGeo
PluginCovfie
PluginDetray)
PluginDetray
PluginTraccc)

# place artifacts in GNU-like paths, e.g. binaries in `<build>/bin`
include(GNUInstallDirs)
Expand All @@ -31,7 +32,8 @@ target_link_libraries(
ActsPluginLegacy
ActsPluginTGeo
ActsPluginCovfie
ActsPluginDetray)
ActsPluginDetray
ActsPluginTraccc)

option(DD4HEP "Build with DD4hep" ON)
if(DD4HEP)
Expand Down
27 changes: 17 additions & 10 deletions cmake/ActsConfig.cmake.in
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,23 @@ if(PluginGeoModel IN_LIST Acts_COMPONENTS)
find_dependency(GeoModelIO @GeoModel_VERSION@ CONFIG EXACT)
endif()

if (PluginCovfie IN_LIST Acts_COMPONENTS)
find_dependency(covfie @covfie_VERSION@ CONFIG EXACT)
endif()

if(PluginDetray IN_LIST Acts_COMPONENTS OR PluginTraccc IN_LIST Acts_COMPONENTS)
find_dependency(vecmem @vecmem_VERSION@ CONFIG EXACT)
find_dependency(algebra-plugins @algebra-plugins_VERSION@ CONFIG EXACT)
find_dependency(detray @detray_VERSION@ CONFIG EXACT)
endif()

if(PluginTraccc IN_LIST Acts_COMPONENTS)
if(NOT @ACTS_USE_SYSTEM_TRACCC@)
add_library(traccc_all INTERFACE IMPORTED GLOBAL)
target_include_directories(traccc_all INTERFACE "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_INCLUDEDIR}")
endif()
endif()

# dependencies that we have built ourselves but cannot be
# straightforwardly handed to cmake
if(NOT @ACTS_USE_SYSTEM_BOOST@)
Expand All @@ -96,16 +113,6 @@ if(PluginPodio IN_LIST Acts_COMPONENTS)
include(${CMAKE_CURRENT_LIST_DIR}/ActsPodioEdmTargets.cmake)
endif()

if (PluginCovfie IN_LIST Acts_COMPONENTS)
find_dependency(covfie @covfie_VERSION@ CONFIG EXACT)
endif()

if(PluginDetray IN_LIST Acts_COMPONENTS)
find_dependency(vecmem @vecmem_VERSION@ CONFIG EXACT)
find_dependency(algebra-plugins @algebra-plugins_VERSION@ CONFIG EXACT)
find_dependency(detray @detray_VERSION@ CONFIG EXACT)
endif()

# load **all** available components. we can not just include the requested
# components since there can be interdependencies between them.
if(NOT Acts_FIND_QUIETLY)
Expand Down
2 changes: 2 additions & 0 deletions thirdparty/algebra-plugins/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ message( STATUS "Building algebra-plugins as part of the Acts project" )

FetchContent_Declare( AlgebraPlugins ${ACTS_ALGEBRAPLUGINS_SOURCE} )

add_definitions(-DALGEBRA_PLUGINS_INCLUDE_ARRAY)

# Options used in the build of Algebra Plugins.
set(ALGEBRA_PLUGINS_BUILD_TESTING FALSE CACHE BOOL
"Turn off the build of the Algebra Plugins unit tests")
Expand Down
2 changes: 2 additions & 0 deletions thirdparty/traccc/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@ set( TRACCC_BUILD_TESTING OFF CACHE BOOL
"Turn off the build of the Traccc unit tests" )
set( TRACCC_BUILD_EXAMPLES OFF CACHE BOOL
"Turn off the build of the Traccc examples" )
set ( TRACCC_BUILD_IO OFF CACHE BOOL
"Turn off the build of Traccc io" )

# Now set up its build.
FetchContent_MakeAvailable( traccc )

0 comments on commit 8cf392a

Please sign in to comment.