Skip to content

Cleanup cmake configuration and remove unused algorithm #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tmadlener wants to merge 4 commits into
base: main
Choose a base branch
from
Open

Cleanup cmake configuration and remove unused algorithm #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
76a4183
Remove unnecessary list
tmadlener Dec 19, 2025
7469fc4
Explicitly state all source files
tmadlener Dec 19, 2025
30f6892
Remove EmptyAlg as it is not interesting to us here
tmadlener Dec 19, 2025
7ca27de
Remove setting that hasn't been relevant for a long time
tmadlener Dec 19, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions empty_alg.py
View file
Open in desktop

This file was deleted.

18 changes: 15 additions & 3 deletions k4ActsTracking/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,17 @@ install(TARGETS k4ActsTracking
LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT shlib
)

file(GLOB _plugin_sources src/components/*.c*)
set(ACTS_PLUGIN_TARGETS "Acts::Core;Acts::PluginDD4hep;Acts::PluginJson;Acts::PluginRoot")
set(_plugin_sources
src/components/ACTSAlgBase.cxx
src/components/ACTSDuplicateRemoval.cxx
src/components/ACTSSeededCKFTrackingAlg.cxx
src/components/ActsGeoSvc.cpp
src/components/FilterTracksAlg.cxx
src/components/GeometryIdMappingTool.cxx
src/components/GeometryIdSelector.cxx
src/components/Helpers.cxx
src/components/TrackTruthAlg.cxx
)

gaudi_add_module(k4ActsTrackingPlugins
SOURCES ${_plugin_sources}
Expand All @@ -41,7 +50,10 @@ gaudi_add_module(k4ActsTrackingPlugins
k4FWCore::k4FWCore
DD4hep::DDCore DD4hep::DDRec
k4ActsTracking
${ACTS_PLUGIN_TARGETS}
Acts::Core
Acts::PluginDD4hep
Acts::PluginJson
Acts::PluginRoot
)
target_include_directories(k4ActsTrackingPlugins PUBLIC
$<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}/include>
Expand Down
34 changes: 0 additions & 34 deletions k4ActsTracking/src/components/EmptyAlg.cpp
View file
Open in desktop

This file was deleted.

45 changes: 0 additions & 45 deletions k4ActsTracking/src/components/EmptyAlg.h
View file
Open in desktop

This file was deleted.

5 changes: 0 additions & 5 deletions test/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@ See the License for the specific language governing permissions and
limitations under the License.
]]

#--- The genConf directory has been renamed to genConfDir in Gaudi 35r1
#--- See https://gitlab.cern.ch/gaudi/Gaudi/-/merge_requests/1158
set(GAUDI_GENCONF_DIR "genConfDir")
if (${Gaudi_VERSION} VERSION_LESS 35.1)
set(GAUDI_GENCONF_DIR "genConf")
endif()

function(set_test_env _testname)
#set_property(TEST ${_testname} APPEND PROPERTY ENVIRONMENT "ROOT_INCLUDE_PATH=$<$<TARGET_EXISTS:podio::podio>:$<TARGET_FILE_DIR:podio::podio>/../include>:$<$<TARGET_EXISTS:EDM4HEP::edm4hep>:$<TARGET_FILE_DIR:EDM4HEP::edm4hep>/../include>:$ENV{ROOT_INCLUDE_PATH}")
Expand Down
Loading