diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-13 15:39:18 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-13 15:39:18 +0000 |
| commit | a19870cd801561c9728c70da15db867621e17d2e (patch) | |
| tree | 026413521ccff8935b2ed58feaf7365d27b0151b /storageframework | |
| parent | f1267c0976ec0013a9c487a5859b901844247dfd (diff) | |
Only need one storageframework library
Diffstat (limited to 'storageframework')
4 files changed, 8 insertions, 25 deletions
diff --git a/storageframework/CMakeLists.txt b/storageframework/CMakeLists.txt index b6e3855e96d..106826fcd51 100644 --- a/storageframework/CMakeLists.txt +++ b/storageframework/CMakeLists.txt @@ -8,11 +8,9 @@ vespa_define_module( LIBS src/vespa/storageframework - src/vespa/storageframework/defaultimplementation src/vespa/storageframework/defaultimplementation/clock src/vespa/storageframework/defaultimplementation/component src/vespa/storageframework/defaultimplementation/thread - src/vespa/storageframework/generic src/vespa/storageframework/generic/clock src/vespa/storageframework/generic/component src/vespa/storageframework/generic/metric diff --git a/storageframework/src/vespa/storageframework/CMakeLists.txt b/storageframework/src/vespa/storageframework/CMakeLists.txt index fcc858ee1eb..ad3898f9a4c 100644 --- a/storageframework/src/vespa/storageframework/CMakeLists.txt +++ b/storageframework/src/vespa/storageframework/CMakeLists.txt @@ -1,8 +1,13 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storageframework INTERFACE +vespa_add_library(storageframework SOURCES + $<TARGET_OBJECTS:storageframework_component> + $<TARGET_OBJECTS:storageframework_status> + $<TARGET_OBJECTS:storageframework_thread> + $<TARGET_OBJECTS:storageframework_clock> + $<TARGET_OBJECTS:storageframework_clockimpl> + $<TARGET_OBJECTS:storageframework_componentimpl> + $<TARGET_OBJECTS:storageframework_threadimpl> INSTALL lib64 DEPENDS - storageframework_defaultimplementation - storageframework_generic ) diff --git a/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt b/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt deleted file mode 100644 index b10bb014c0c..00000000000 --- a/storageframework/src/vespa/storageframework/defaultimplementation/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storageframework_defaultimplementation - SOURCES - $<TARGET_OBJECTS:storageframework_clockimpl> - $<TARGET_OBJECTS:storageframework_componentimpl> - $<TARGET_OBJECTS:storageframework_threadimpl> - INSTALL lib64 - DEPENDS - storageframework_generic -) diff --git a/storageframework/src/vespa/storageframework/generic/CMakeLists.txt b/storageframework/src/vespa/storageframework/generic/CMakeLists.txt deleted file mode 100644 index 2507fc8cf41..00000000000 --- a/storageframework/src/vespa/storageframework/generic/CMakeLists.txt +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storageframework_generic - SOURCES - $<TARGET_OBJECTS:storageframework_component> - $<TARGET_OBJECTS:storageframework_status> - $<TARGET_OBJECTS:storageframework_thread> - $<TARGET_OBJECTS:storageframework_clock> - INSTALL lib64 - DEPENDS -) |