aboutsummaryrefslogtreecommitdiffstats
path: root/storage/CMakeLists.txt
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-05-18 22:14:24 +0000
committerHenning Baldersheim <balder@yahoo-inc.com>2022-05-18 22:14:24 +0000
commit7b0a212729d115561163b702fec8794d91b0653d (patch)
tree7f70faf19a7f27d9af422e9a08ffbaef1cb72cb7 /storage/CMakeLists.txt
parentc5e298b28a9fdf524fe9282a3cfe9ae7aaef174f (diff)
Collapse storageframework back into storage.
Diffstat (limited to 'storage/CMakeLists.txt')
-rw-r--r--storage/CMakeLists.txt12
1 files changed, 11 insertions, 1 deletions
diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt
index e45c78f68b9..fc084bf2e80 100644
--- a/storage/CMakeLists.txt
+++ b/storage/CMakeLists.txt
@@ -15,7 +15,6 @@ vespa_define_module(
vespalib
vdslib
persistence
- storageframework
EXTERNAL_DEPENDS
${VESPA_GLIBC_RT_LIB}
@@ -42,6 +41,14 @@ vespa_define_module(
src/vespa/storage/storageutil
src/vespa/storage/tools
src/vespa/storage/visiting
+ src/vespa/storageframework/defaultimplementation/clock
+ src/vespa/storageframework/defaultimplementation/component
+ src/vespa/storageframework/defaultimplementation/thread
+ src/vespa/storageframework/generic/clock
+ src/vespa/storageframework/generic/component
+ src/vespa/storageframework/generic/metric
+ src/vespa/storageframework/generic/status
+ src/vespa/storageframework/generic/thread
TEST_DEPENDS
messagebus_messagebus-test
@@ -59,6 +66,9 @@ vespa_define_module(
src/tests/persistence
src/tests/persistence/common
src/tests/persistence/filestorage
+ src/tests/storageframework
+ src/tests/storageframework/clock
+ src/tests/storageframework/thread
src/tests/storageserver
src/tests/storageserver/rpc
src/tests/visiting