From a0d93eb68c590261e8128682777ebd024b00bc35 Mon Sep 17 00:00:00 2001 From: David Banks <47112877+dbanks12@users.noreply.github.com> Date: Wed, 19 Jul 2023 17:12:49 -0400 Subject: [PATCH] chore: rename `barretenberg_module` to `circuits_cmake_module` in circuits (#1122) --- circuits/cpp/cmake/module.cmake | 6 +++--- circuits/cpp/src/aztec3/circuits/abis/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/circuits/apps/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/circuits/kernel/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/circuits/recursion/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/circuits/rollup/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/circuits/rollup/base/CMakeLists.txt | 2 +- .../cpp/src/aztec3/circuits/rollup/merge/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/circuits/rollup/root/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/dbs/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/oracle/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/utils/CMakeLists.txt | 2 +- circuits/cpp/src/aztec3/utils/types/CMakeLists.txt | 2 +- 13 files changed, 15 insertions(+), 15 deletions(-) diff --git a/circuits/cpp/cmake/module.cmake b/circuits/cpp/cmake/module.cmake index f654774b779..60b265c1d9c 100644 --- a/circuits/cpp/cmake/module.cmake +++ b/circuits/cpp/cmake/module.cmake @@ -1,6 +1,6 @@ -# copyright 2019 Spilsbury Holdings +# copyright 2020 Spilsbury Holdings # -# usage: barretenberg_module(module_name [dependencies ...]) +# usage: circuits_cmake_module(module_name [dependencies ...]) # # Scans for all .cpp files in a subdirectory, and creates a library named . # Scans for all .test.cpp files in a subdirectory, and creates a gtest binary named _tests. @@ -12,7 +12,7 @@ # Then we declare executables/libraries that are to be built from these object files. # These assets will only be linked as their dependencies complete, but we can parallelise the compilation at least. -function(barretenberg_module MODULE_NAME) +function(circuits_cmake_module MODULE_NAME) file(GLOB_RECURSE SOURCE_FILES *.cpp) file(GLOB_RECURSE HEADER_FILES *.hpp *.tcc) list(FILTER SOURCE_FILES EXCLUDE REGEX ".*\.(fuzzer|test|bench).cpp$") diff --git a/circuits/cpp/src/aztec3/circuits/abis/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/abis/CMakeLists.txt index d261be7372c..53fc0c72e0a 100644 --- a/circuits/cpp/src/aztec3/circuits/abis/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/abis/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_abis barretenberg ) \ No newline at end of file diff --git a/circuits/cpp/src/aztec3/circuits/apps/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/apps/CMakeLists.txt index 91afc83b650..59a9a8ad289 100644 --- a/circuits/cpp/src/aztec3/circuits/apps/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/apps/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_apps barretenberg ) \ No newline at end of file diff --git a/circuits/cpp/src/aztec3/circuits/kernel/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/kernel/CMakeLists.txt index 960adcf4854..88e86fd9163 100644 --- a/circuits/cpp/src/aztec3/circuits/kernel/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/kernel/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_kernel # Question: why can't I link to these barretenberg modules? diff --git a/circuits/cpp/src/aztec3/circuits/recursion/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/recursion/CMakeLists.txt index f9586745db8..3386bf2e151 100644 --- a/circuits/cpp/src/aztec3/circuits/recursion/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/recursion/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_recursion barretenberg ) \ No newline at end of file diff --git a/circuits/cpp/src/aztec3/circuits/rollup/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/rollup/CMakeLists.txt index 4464c55aa9e..d2994796d2c 100644 --- a/circuits/cpp/src/aztec3/circuits/rollup/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/rollup/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_rollup aztec3_circuits_kernel barretenberg diff --git a/circuits/cpp/src/aztec3/circuits/rollup/base/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/rollup/base/CMakeLists.txt index 4464c55aa9e..d2994796d2c 100644 --- a/circuits/cpp/src/aztec3/circuits/rollup/base/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/rollup/base/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_rollup aztec3_circuits_kernel barretenberg diff --git a/circuits/cpp/src/aztec3/circuits/rollup/merge/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/rollup/merge/CMakeLists.txt index fb099fb3e10..ba98f5c140d 100644 --- a/circuits/cpp/src/aztec3/circuits/rollup/merge/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/rollup/merge/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_rollup barretenberg ) \ No newline at end of file diff --git a/circuits/cpp/src/aztec3/circuits/rollup/root/CMakeLists.txt b/circuits/cpp/src/aztec3/circuits/rollup/root/CMakeLists.txt index 4464c55aa9e..d2994796d2c 100644 --- a/circuits/cpp/src/aztec3/circuits/rollup/root/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/circuits/rollup/root/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_circuits_rollup aztec3_circuits_kernel barretenberg diff --git a/circuits/cpp/src/aztec3/dbs/CMakeLists.txt b/circuits/cpp/src/aztec3/dbs/CMakeLists.txt index b51bfec1c3a..49c80213432 100644 --- a/circuits/cpp/src/aztec3/dbs/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/dbs/CMakeLists.txt @@ -27,7 +27,7 @@ if(NOT WASM) link_libraries(leveldb) endif() -barretenberg_module( +circuits_cmake_module( aztec3_dbs barretenberg ) \ No newline at end of file diff --git a/circuits/cpp/src/aztec3/oracle/CMakeLists.txt b/circuits/cpp/src/aztec3/oracle/CMakeLists.txt index 6acd78ed5e6..1e9734a1d34 100644 --- a/circuits/cpp/src/aztec3/oracle/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/oracle/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_oracle aztec3_circuits_apps barretenberg diff --git a/circuits/cpp/src/aztec3/utils/CMakeLists.txt b/circuits/cpp/src/aztec3/utils/CMakeLists.txt index e2811b554d8..5bda22d8e8a 100644 --- a/circuits/cpp/src/aztec3/utils/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/utils/CMakeLists.txt @@ -1,6 +1,6 @@ add_subdirectory(types) -barretenberg_module( +circuits_cmake_module( aztec3_utils barretenberg ) \ No newline at end of file diff --git a/circuits/cpp/src/aztec3/utils/types/CMakeLists.txt b/circuits/cpp/src/aztec3/utils/types/CMakeLists.txt index 0fff1d17e9b..0e089a172fe 100644 --- a/circuits/cpp/src/aztec3/utils/types/CMakeLists.txt +++ b/circuits/cpp/src/aztec3/utils/types/CMakeLists.txt @@ -1,4 +1,4 @@ -barretenberg_module( +circuits_cmake_module( aztec3_types barretenberg ) \ No newline at end of file