From a3795f44c242bc4e4c056715136cfd1f9f2b929f Mon Sep 17 00:00:00 2001 From: lupin012 <58134934+lupin012@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:22:30 +0100 Subject: [PATCH 1/3] add PROJECT DIR on filter --- cmake/common/targets.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/common/targets.cmake b/cmake/common/targets.cmake index bce3064f65..16299cd0a1 100644 --- a/cmake/common/targets.cmake +++ b/cmake/common/targets.cmake @@ -18,7 +18,7 @@ find_package(Catch2 REQUIRED) macro(list_filter VAR EXCLUDE_REGEX) foreach(R IN LISTS ${EXCLUDE_REGEX}) - list(FILTER ${VAR} EXCLUDE REGEX "${R}") + list(FILTER ${VAR} EXCLUDE REGEX "{SILKWORM_SRC_DIR}/${R}") endforeach() endmacro() From 4fd6692dcc07e35e134d7f48d842ab106d2082d7 Mon Sep 17 00:00:00 2001 From: lupin012 <58134934+lupin012@users.noreply.github.com> Date: Sun, 10 Mar 2024 22:23:36 +0100 Subject: [PATCH 2/3] add first level of module in filter --- silkworm/node/CMakeLists.txt | 2 +- silkworm/node/db/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/silkworm/node/CMakeLists.txt b/silkworm/node/CMakeLists.txt index a0086f59a8..4afe2e996e 100644 --- a/silkworm/node/CMakeLists.txt +++ b/silkworm/node/CMakeLists.txt @@ -54,5 +54,5 @@ silkworm_library( silkworm_node PUBLIC ${SILKWORM_NODE_PUBLIC_LIBS} PRIVATE ${SILKWORM_NODE_PRIVATE_LIBS} - EXCLUDE_REGEX "db" + EXCLUDE_REGEX "node/db" ) diff --git a/silkworm/node/db/CMakeLists.txt b/silkworm/node/db/CMakeLists.txt index d01ac95072..ecb5479537 100644 --- a/silkworm/node/db/CMakeLists.txt +++ b/silkworm/node/db/CMakeLists.txt @@ -47,5 +47,5 @@ silkworm_library( silkworm_db PUBLIC ${LIBS_PUBLIC} PRIVATE ${LIBS_PRIVATE} - EXCLUDE_REGEX "db/etl" + EXCLUDE_REGEX "node/db/etl" ) From ee5ef88040366e731bdb513a69d8506ce43ec849 Mon Sep 17 00:00:00 2001 From: lupin012 <58134934+lupin012@users.noreply.github.com> Date: Sun, 10 Mar 2024 23:14:30 +0100 Subject: [PATCH 3/3] add $ --- cmake/common/targets.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/common/targets.cmake b/cmake/common/targets.cmake index 16299cd0a1..08be4e7124 100644 --- a/cmake/common/targets.cmake +++ b/cmake/common/targets.cmake @@ -18,7 +18,7 @@ find_package(Catch2 REQUIRED) macro(list_filter VAR EXCLUDE_REGEX) foreach(R IN LISTS ${EXCLUDE_REGEX}) - list(FILTER ${VAR} EXCLUDE REGEX "{SILKWORM_SRC_DIR}/${R}") + list(FILTER ${VAR} EXCLUDE REGEX "${SILKWORM_SRC_DIR}/${R}") endforeach() endmacro()