From 2384865bff2b8d03539abddc3511b3351bbf8f6b Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 18 Aug 2021 14:37:05 +0300 Subject: [PATCH] UnitTest: Adapt to Google Benchmark v1.5.4 Change-Id: I2c2a34206dbc01d277242f5d736eef3e1333b01f Reviewed-by: Marco Bubke --- cmake/FindGoogleBenchmark.cmake | 1 + tests/unit/unittest/benchmark_dependency.pri | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cmake/FindGoogleBenchmark.cmake b/cmake/FindGoogleBenchmark.cmake index 5713803535a..c0c5125da72 100644 --- a/cmake/FindGoogleBenchmark.cmake +++ b/cmake/FindGoogleBenchmark.cmake @@ -57,6 +57,7 @@ if(GoogleBenchmark_FOUND AND NOT TARGET GoogleBenchmark) "${GOOGLE_BENCHMARK_SRC_DIR}/counter.cc" "${GOOGLE_BENCHMARK_SRC_DIR}/csv_reporter.cc" "${GOOGLE_BENCHMARK_SRC_DIR}/json_reporter.cc" + "${GOOGLE_BENCHMARK_SRC_DIR}/perf_counters.cc" "${GOOGLE_BENCHMARK_SRC_DIR}/reporter.cc" "${GOOGLE_BENCHMARK_SRC_DIR}/sleep.cc" "${GOOGLE_BENCHMARK_SRC_DIR}/statistics.cc" diff --git a/tests/unit/unittest/benchmark_dependency.pri b/tests/unit/unittest/benchmark_dependency.pri index e9e0408530a..d5a0b205583 100644 --- a/tests/unit/unittest/benchmark_dependency.pri +++ b/tests/unit/unittest/benchmark_dependency.pri @@ -14,6 +14,7 @@ GOOGLEBENCHMARK_DIR = $$(GOOGLEBENCHMARK_DIR) $$GOOGLEBENCHMARK_DIR/src/counter.cc \ $$GOOGLEBENCHMARK_DIR/src/csv_reporter.cc \ $$GOOGLEBENCHMARK_DIR/src/json_reporter.cc \ + $$GOOGLEBENCHMARK_DIR/src/perf_counters.cc \ $$GOOGLEBENCHMARK_DIR/src/reporter.cc \ $$GOOGLEBENCHMARK_DIR/src/sleep.cc \ $$GOOGLEBENCHMARK_DIR/src/statistics.cc \ @@ -21,5 +22,5 @@ GOOGLEBENCHMARK_DIR = $$(GOOGLEBENCHMARK_DIR) $$GOOGLEBENCHMARK_DIR/src/sysinfo.cc \ $$GOOGLEBENCHMARK_DIR/src/timers.cc - win32:LIBS += -lShlwapi + win32:LIBS += -lshlwapi }