Extract version string into GetBenchmarkVersiom()

google · Jan 24, 2024 · a7a5822 · a7a5822
1 parent 341783b
commit a7a5822
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/include/benchmark/benchmark.h b/include/benchmark/benchmark.h
@@ -302,6 +302,9 @@ class BenchmarkReporter;
 // Default number of minimum benchmark running time in seconds.
 const char kDefaultMinTimeStr[] = "0.5s";
 
+// Returns the version of the library.
+BENCHMARK_EXPORT std::string GetBenchmarkVersiom();
+
 BENCHMARK_EXPORT void PrintDefaultHelp();
 
 BENCHMARK_EXPORT void Initialize(int* argc, char** argv,

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -29,7 +29,7 @@ target_include_directories(benchmark PUBLIC
 )
 
 set_property(
-  SOURCE json_reporter.cc
+  SOURCE benchmark.cc
   APPEND
   PROPERTY COMPILE_DEFINITIONS
   BENCHMARK_VERSION="${VERSION}"

diff --git a/src/benchmark.cc b/src/benchmark.cc
@@ -748,6 +748,14 @@ int InitializeStreams() {
 
 }  // end namespace internal
 
+std::string GetBenchmarkVersiom() {
+#if defined(BENCHMARK_VERSION)
+  return {BENCHMARK_VERSION};
+#else
+  return "hello, bazel!";
+#endif
+}
+
 void PrintDefaultHelp() {
   fprintf(stdout,
           "benchmark"

diff --git a/src/json_reporter.cc b/src/json_reporter.cc
@@ -167,12 +167,7 @@ bool JSONReporter::ReportContext(const Context& context) {
   }
   out << "],\n";
 
-#if defined(BENCHMARK_VERSION)
-  const char library_version[] = BENCHMARK_VERSION;
-#else
-  const char library_version[] = "hello, bazel!";
-#endif
-  out << indent << FormatKV("library_version", library_version);
+  out << indent << FormatKV("library_version", GetBenchmarkVersiom());
   out << ",\n";
 
 #if defined(NDEBUG)