Skip to content

Make sure benchmark::benchmark stays optional (O2-1973) #5231

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
ktf merged 3 commits into from
Jan 19, 2021
Merged

Make sure benchmark::benchmark stays optional (O2-1973) #5231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6702acc
Make sure benchmark::benchmark stays optional
ktf Jan 19, 2021
4ffa491
Update CMakeLists.txt
ktf Jan 19, 2021
f4baaf1
Update CMakeLists.txt
ktf Jan 19, 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
2 changes: 2 additions & 0 deletions Framework/Utils/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,7 @@ o2_add_test(DPLRawParser
COMPONENT_NAME DPLUtils
LABELS dplutils)

if (TARGET benchmark::benchmark)
foreach(b
RawParser
)
Expand All @@ -96,3 +97,4 @@ foreach(b
LABELS dplutils benchmark
PUBLIC_LINK_LIBRARIES O2::DPLUtils benchmark::benchmark)
endforeach()
endif()
4 changes: 3 additions & 1 deletion Utilities/Mergers/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ o2_add_executable(benchmark-empty-loop
COMPONENT_NAME mergers
PUBLIC_LINK_LIBRARIES O2::Mergers)

if (TARGET benchmark::benchmark)
o2_add_executable(benchmark-miscellaneous
SOURCES test/benchmark_Miscellaneous.cxx
COMPONENT_NAME mergers
Expand All @@ -66,6 +67,7 @@ o2_add_executable(benchmark-types
SOURCES test/benchmark_Types.cxx
COMPONENT_NAME mergers
PUBLIC_LINK_LIBRARIES O2::Mergers benchmark::benchmark)
endif()

o2_add_test(InfrastructureBuilder
SOURCES test/test_InfrastructureBuilder.cxx
Expand All @@ -83,4 +85,4 @@ o2_add_test(ObjectStore
SOURCES test/test_ObjectStore.cxx
COMPONENT_NAME mergers
PUBLIC_LINK_LIBRARIES O2::Mergers
LABELS utils)
LABELS utils)
4 changes: 3 additions & 1 deletion Utilities/rANS/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,13 @@ o2_add_test(CombinedIterator
COMPONENT_NAME rANS
LABELS utils)

if (TARGET benchmark::benchmark)
o2_add_executable(CombinedIterator
SOURCES benchmarks/bench_ransCombinedIterator.cxx
COMPONENT_NAME rANS
IS_BENCHMARK
PUBLIC_LINK_LIBRARIES O2::rANS benchmark::benchmark)
endif()

o2_add_executable(rans-encode-decode-8
TARGETVARNAME targetName
Expand All @@ -57,4 +59,4 @@ o2_add_executable(rans-encode-decode-32
TARGETVARNAME targetName
SOURCES run/bin-encode-decode.cxx
PUBLIC_LINK_LIBRARIES O2::rANS Boost::program_options)
target_compile_definitions(${targetName} PRIVATE -DSOURCE_T=uint32_t)
target_compile_definitions(${targetName} PRIVATE -DSOURCE_T=uint32_t)