Skip to content
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

set library version in bazel #1746

Merged
merged 4 commits into from
Jan 29, 2024
Merged

set library version in bazel #1746

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
bfb2c96
set library version in bazel
dmah42 Jan 29, 2024
719e136
remove fallback
dmah42 Jan 29, 2024
2d99fd0
even simpler
dmah42 Jan 29, 2024
1cc5d67
clang format
dmah42 Jan 29, 2024
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
1 change: 1 addition & 0 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@ cc_library(
}),
defines = [
"BENCHMARK_STATIC_DEFINE",
"BENCHMARK_VERSION=\\\"" + (module_version() if module_version() != None else "") + "\\\"",
] + select({
":perfcounters": ["HAVE_LIBPFM"],
"//conditions:default": [],
Expand Down
8 changes: 1 addition & 7 deletions src/benchmark.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -748,13 +748,7 @@ int InitializeStreams() {

} // end namespace internal

std::string GetBenchmarkVersiom() {
#if defined(BENCHMARK_VERSION)
return {BENCHMARK_VERSION};
#else
return "hello, bazel!";
Copy link
Collaborator

@LebedevRI LebedevRI Jan 29, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, just return {BENCHMARK_VERSION};

#endif
}
std::string GetBenchmarkVersiom() { return {BENCHMARK_VERSION}; }

void PrintDefaultHelp() {
fprintf(stdout,
Expand Down
Loading