Skip to content

Fix o2_add_dpl_workflow on Ubuntu and some other systems #5172

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

Merged
davidrohr merged 4 commits into from
Jan 14, 2021
Merged

Fix o2_add_dpl_workflow on Ubuntu and some other systems #5172

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
f54a206
DPL: do not mask errros when generating workflows
ktf Jan 12, 2021
514be36
Use o2_add_executable for DataSampling standalone workflow
knopers8 Jan 13, 2021
380f1f6
Use o2_add_executable for other datasampling executables
davidrohr Jan 13, 2021
ba7ae0e
Fix missing LD_LIBRARY_PATH for add_custom_command
davidrohr Jan 13, 2021
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
18 changes: 9 additions & 9 deletions Utilities/DataSampling/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,27 +61,27 @@ endforeach()

o2_data_file(COPY etc/exampleDataSamplingConfig.json DESTINATION etc)

o2_add_dpl_workflow(standalone
o2_add_executable(standalone
SOURCES src/dataSamplingStandalone.cxx
COMPONENT_NAME DataSampling
PUBLIC_LINK_LIBRARIES O2::DataSampling)
PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)

o2_add_dpl_workflow(datasampling-pod-and-root
o2_add_executable(datasampling-pod-and-root
SOURCES test/dataSamplingPodAndRoot.cxx
COMPONENT_NAME DataSampling
PUBLIC_LINK_LIBRARIES O2::DataSampling)
PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)

o2_add_dpl_workflow(datasampling-parallel
o2_add_executable(datasampling-parallel
SOURCES test/dataSamplingParallel.cxx
COMPONENT_NAME DataSampling
PUBLIC_LINK_LIBRARIES O2::DataSampling)
PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)

o2_add_dpl_workflow(datasampling-time-pipeline
o2_add_executable(datasampling-time-pipeline
SOURCES test/dataSamplingTimePipeline.cxx
COMPONENT_NAME DataSampling
PUBLIC_LINK_LIBRARIES O2::DataSampling)
PUBLIC_LINK_LIBRARIES O2::Framework O2::DataSampling)

o2_add_dpl_workflow(datasampling-benchmark
SOURCES test/dataSamplingBenchmark.cxx
COMPONENT_NAME DataSampling
PUBLIC_LINK_LIBRARIES O2::DataSampling)
PUBLIC_LINK_LIBRARIES O2::DataSampling)
2 changes: 1 addition & 1 deletion cmake/O2AddWorkflow.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ function(o2_add_dpl_workflow baseTargetName)

add_custom_command(
TARGET ${targetExeName} POST_BUILD
COMMAND $<TARGET_FILE:${targetExeName}> -b | cat > ${jsonFile})
COMMAND ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:${CMAKE_LIBRARY_OUTPUT_DIRECTORY}" $<TARGET_FILE:${targetExeName}> -b --dump-workflow --dump-workflow-file ${jsonFile})

install(
FILES ${CMAKE_CURRENT_BINARY_DIR}/${jsonFile}
Expand Down