feat: Utilize globally installed benchmark if available (AztecProtoco…

…l/barretenberg#152)
AztecProtocol · Feb 17, 2023 · 8b700b9 · 8b700b9
1 parent 167c6a3
commit 8b700b9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/circuits/cpp/barretenberg/cpp/cmake/benchmark.cmake b/circuits/cpp/barretenberg/cpp/cmake/benchmark.cmake
@@ -9,12 +9,16 @@ if(BENCHMARKS)
         benchmark
         GIT_REPOSITORY https://github.com/google/benchmark
         GIT_TAG v1.7.1
+        FIND_PACKAGE_ARGS
     )
 
-    FetchContent_GetProperties(benchmark)
-    if(NOT benchmark_POPULATED)
-        fetchcontent_populate(benchmark)
-        set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Benchmark tests off")
-        add_subdirectory(${benchmark_SOURCE_DIR} ${benchmark_BINARY_DIR} EXCLUDE_FROM_ALL)
+    set(BENCHMARK_ENABLE_TESTING OFF CACHE BOOL "Benchmark tests off")
+
+    FetchContent_MakeAvailable(benchmark)
+    if(NOT benchmark_FOUND)
+        # FetchContent_MakeAvailable calls FetchContent_Populate if `find_package` is unsuccessful
+        # so these variables will be available if we reach this case
+        set_property(DIRECTORY ${benchmark_SOURCE_DIR} PROPERTY EXCLUDE_FROM_ALL)
+        set_property(DIRECTORY ${benchmark_BINARY_DIR} PROPERTY EXCLUDE_FROM_ALL)
     endif()
 endif()
diff --git a/circuits/cpp/barretenberg/cpp/cmake/module.cmake b/circuits/cpp/barretenberg/cpp/cmake/module.cmake
@@ -182,7 +182,7 @@ function(barretenberg_module MODULE_NAME)
         target_link_libraries(
             ${MODULE_NAME}_bench_objects
             PRIVATE
-            benchmark
+            benchmark::benchmark
             ${TBB_IMPORTED_TARGETS}
         )
 
@@ -197,7 +197,7 @@ function(barretenberg_module MODULE_NAME)
             PRIVATE
             ${MODULE_LINK_NAME}
             ${ARGN}
-            benchmark
+            benchmark::benchmark
             ${TBB_IMPORTED_TARGETS}
         )
 

diff --git a/circuits/cpp/barretenberg/cpp/src/aztec/benchmark/honk_bench/CMakeLists.txt b/circuits/cpp/barretenberg/cpp/src/aztec/benchmark/honk_bench/CMakeLists.txt
@@ -4,7 +4,7 @@ target_link_libraries(
   honk_bench
   stdlib_primitives
   env
-  benchmark
+  benchmark::benchmark
 )
 
 add_custom_target(

diff --git a/circuits/cpp/barretenberg/cpp/src/aztec/benchmark/plonk_bench/CMakeLists.txt b/circuits/cpp/barretenberg/cpp/src/aztec/benchmark/plonk_bench/CMakeLists.txt
@@ -4,7 +4,7 @@ target_link_libraries(
   plonk_bench
   stdlib_primitives
   env
-  benchmark
+  benchmark::benchmark
 )
 
 add_custom_target(