diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-18 12:53:54 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-18 12:53:54 +0000 |
commit | 58f10a3c11319255dd9b17f1be906cdac35606c9 (patch) | |
tree | d882c2c0941a2830a6fdc213a6825969c3e7875f /storage | |
parent | eb7e87453614da267cdb31976c523f8656bb5796 (diff) |
We only need to expose a single libstorage.so. No need to split up in storage storgae_storageserver and storage_distributor.
Diffstat (limited to 'storage')
6 files changed, 14 insertions, 16 deletions
diff --git a/storage/src/tests/distributor/CMakeLists.txt b/storage/src/tests/distributor/CMakeLists.txt index 501f9a18c47..c8dde75c73d 100644 --- a/storage/src/tests/distributor/CMakeLists.txt +++ b/storage/src/tests/distributor/CMakeLists.txt @@ -55,7 +55,7 @@ vespa_add_executable(storage_distributor_gtest_runner_app TEST DEPENDS storage_testcommon storage_testhostreporter - storage_distributor + storage GTest::GTest ) diff --git a/storage/src/tests/storageserver/CMakeLists.txt b/storage/src/tests/storageserver/CMakeLists.txt index 4e0b9a2c4de..22d3e71021c 100644 --- a/storage/src/tests/storageserver/CMakeLists.txt +++ b/storage/src/tests/storageserver/CMakeLists.txt @@ -3,8 +3,8 @@ vespa_add_library(storage_teststorageserver TEST SOURCES testvisitormessagesession.cpp DEPENDS - storage_storageserver storage_testcommon + storage ) vespa_add_executable(storage_storageserver_gtest_runner_app TEST @@ -21,9 +21,9 @@ vespa_add_executable(storage_storageserver_gtest_runner_app TEST statereportertest.cpp gtest_runner.cpp DEPENDS - storage_storageserver storage_testcommon storage_teststorageserver + storage GTest::GTest ) diff --git a/storage/src/tests/storageserver/rpc/CMakeLists.txt b/storage/src/tests/storageserver/rpc/CMakeLists.txt index db1ffd3f77d..4e5025a58d2 100644 --- a/storage/src/tests/storageserver/rpc/CMakeLists.txt +++ b/storage/src/tests/storageserver/rpc/CMakeLists.txt @@ -7,9 +7,9 @@ vespa_add_executable(storage_storageserver_rpc_gtest_runner_app TEST storage_api_rpc_service_test.cpp gtest_runner.cpp DEPENDS - storage_storageserver storage_testcommon storage_teststorageserver + storage GTest::GTest ) diff --git a/storage/src/vespa/storage/CMakeLists.txt b/storage/src/vespa/storage/CMakeLists.txt index d7fca273229..679245b06d1 100644 --- a/storage/src/vespa/storage/CMakeLists.txt +++ b/storage/src/vespa/storage/CMakeLists.txt @@ -12,6 +12,14 @@ vespa_add_library(storage $<TARGET_OBJECTS:storage_thread> $<TARGET_OBJECTS:storage_status> $<TARGET_OBJECTS:storage_component> + $<TARGET_OBJECTS:storage_storageserver_rpc> + $<TARGET_OBJECTS:storage_storageserver> + $<TARGET_OBJECTS:storage_distributoroperation> + $<TARGET_OBJECTS:storage_distributoroperationexternal> + $<TARGET_OBJECTS:storage_distributoroperationidealstate> + $<TARGET_OBJECTS:storage_distributormaintenance> + $<TARGET_OBJECTS:storage_distributor_bucketdb> + $<TARGET_OBJECTS:storage_distributor> INSTALL lib64 DEPENDS ) diff --git a/storage/src/vespa/storage/distributor/CMakeLists.txt b/storage/src/vespa/storage/distributor/CMakeLists.txt index 470bfb69abb..184fee5d2c9 100644 --- a/storage/src/vespa/storage/distributor/CMakeLists.txt +++ b/storage/src/vespa/storage/distributor/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_distributor +vespa_add_library(storage_distributor OBJECT SOURCES activecopy.cpp blockingoperationstarter.cpp @@ -55,12 +55,5 @@ vespa_add_library(storage_distributor top_level_distributor.cpp update_metric_set.cpp visitormetricsset.cpp - $<TARGET_OBJECTS:storage_distributoroperation> - $<TARGET_OBJECTS:storage_distributoroperationexternal> - $<TARGET_OBJECTS:storage_distributoroperationidealstate> - $<TARGET_OBJECTS:storage_distributormaintenance> - $<TARGET_OBJECTS:storage_distributor_bucketdb> - INSTALL lib64 DEPENDS - storage ) diff --git a/storage/src/vespa/storage/storageserver/CMakeLists.txt b/storage/src/vespa/storage/storageserver/CMakeLists.txt index 1706b858256..8b82bb251b2 100644 --- a/storage/src/vespa/storage/storageserver/CMakeLists.txt +++ b/storage/src/vespa/storage/storageserver/CMakeLists.txt @@ -1,6 +1,6 @@ # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(storage_storageserver +vespa_add_library(storage_storageserver OBJECT SOURCES bouncer.cpp bouncer_metrics.cpp @@ -28,8 +28,5 @@ vespa_add_library(storage_storageserver storagenodecontext.cpp tls_statistics_metrics_wrapper.cpp $<TARGET_OBJECTS:storage_storageserver_rpc> - INSTALL lib64 DEPENDS - storage - storage_distributor ) |