diff --git a/documentapi/CMakeLists.txt b/documentapi/CMakeLists.txt index 2ddb2c3c528d..53a9fce06782 100644 --- a/documentapi/CMakeLists.txt +++ b/documentapi/CMakeLists.txt @@ -7,7 +7,7 @@ vespa_define_module( vespa_fnet vespa_document slobrok - messagebus + vespa_messagebus vespa_configdefinitions vdslib diff --git a/messagebus/src/apps/printversion/CMakeLists.txt b/messagebus/src/apps/printversion/CMakeLists.txt index 7ac02531dd5b..c9d504182d57 100644 --- a/messagebus/src/apps/printversion/CMakeLists.txt +++ b/messagebus/src/apps/printversion/CMakeLists.txt @@ -3,5 +3,5 @@ vespa_add_executable(messagebus_printversion_app SOURCES printversion.cpp DEPENDS - messagebus + vespa_messagebus ) diff --git a/messagebus/src/tests/advancedrouting/CMakeLists.txt b/messagebus/src/tests/advancedrouting/CMakeLists.txt index ca2d3e4bba03..df69125c46c3 100644 --- a/messagebus/src/tests/advancedrouting/CMakeLists.txt +++ b/messagebus/src/tests/advancedrouting/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_advancedrouting_test_app TEST advancedrouting.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_advancedrouting_test_app COMMAND messagebus_advancedrouting_test_app) diff --git a/messagebus/src/tests/auto-reply/CMakeLists.txt b/messagebus/src/tests/auto-reply/CMakeLists.txt index 92bbd0989727..8ef5ccb59838 100644 --- a/messagebus/src/tests/auto-reply/CMakeLists.txt +++ b/messagebus/src/tests/auto-reply/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_auto-reply_test_app TEST auto-reply.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_auto-reply_test_app COMMAND messagebus_auto-reply_test_app) diff --git a/messagebus/src/tests/blob/CMakeLists.txt b/messagebus/src/tests/blob/CMakeLists.txt index e6187d46435d..6232ff1314a7 100644 --- a/messagebus/src/tests/blob/CMakeLists.txt +++ b/messagebus/src/tests/blob/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(messagebus_blob_test_app TEST SOURCES blob.cpp DEPENDS - messagebus + vespa_messagebus messagebus_messagebus-test ) vespa_add_test(NAME messagebus_blob_test_app COMMAND messagebus_blob_test_app) diff --git a/messagebus/src/tests/bucketsequence/CMakeLists.txt b/messagebus/src/tests/bucketsequence/CMakeLists.txt index cc138fb94cd4..678372ae5590 100644 --- a/messagebus/src/tests/bucketsequence/CMakeLists.txt +++ b/messagebus/src/tests/bucketsequence/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_bucketsequence_test_app TEST bucketsequence.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_bucketsequence_test_app COMMAND messagebus_bucketsequence_test_app) diff --git a/messagebus/src/tests/choke/CMakeLists.txt b/messagebus/src/tests/choke/CMakeLists.txt index c87c51f8c828..d62c6afb06f2 100644 --- a/messagebus/src/tests/choke/CMakeLists.txt +++ b/messagebus/src/tests/choke/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_choke_test_app TEST choke.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_choke_test_app NO_VALGRIND COMMAND messagebus_choke_test_app) diff --git a/messagebus/src/tests/configagent/CMakeLists.txt b/messagebus/src/tests/configagent/CMakeLists.txt index 9b07222fc74a..d209378d850c 100644 --- a/messagebus/src/tests/configagent/CMakeLists.txt +++ b/messagebus/src/tests/configagent/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_configagent_test_app TEST configagent.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_configagent_test_app COMMAND messagebus_configagent_test_app) diff --git a/messagebus/src/tests/context/CMakeLists.txt b/messagebus/src/tests/context/CMakeLists.txt index ee0687f7bd79..85b39bcb28ff 100644 --- a/messagebus/src/tests/context/CMakeLists.txt +++ b/messagebus/src/tests/context/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_context_test_app TEST context.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_context_test_app COMMAND messagebus_context_test_app) diff --git a/messagebus/src/tests/emptyreply/CMakeLists.txt b/messagebus/src/tests/emptyreply/CMakeLists.txt index 5aebfd08aeb9..580d53a407c1 100644 --- a/messagebus/src/tests/emptyreply/CMakeLists.txt +++ b/messagebus/src/tests/emptyreply/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_emptyreply_test_app TEST emptyreply.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_emptyreply_test_app COMMAND messagebus_emptyreply_test_app) diff --git a/messagebus/src/tests/error/CMakeLists.txt b/messagebus/src/tests/error/CMakeLists.txt index 15b3f709710a..93c76493660e 100644 --- a/messagebus/src/tests/error/CMakeLists.txt +++ b/messagebus/src/tests/error/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_error_test_app TEST error.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_error_test_app COMMAND messagebus_error_test_app) diff --git a/messagebus/src/tests/identity/CMakeLists.txt b/messagebus/src/tests/identity/CMakeLists.txt index 39ce7f23d06e..456c258abe27 100644 --- a/messagebus/src/tests/identity/CMakeLists.txt +++ b/messagebus/src/tests/identity/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_identity_test_app TEST identity.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_identity_test_app COMMAND messagebus_identity_test_app) diff --git a/messagebus/src/tests/messagebus/CMakeLists.txt b/messagebus/src/tests/messagebus/CMakeLists.txt index f05141ca28fb..91aad4f9a636 100644 --- a/messagebus/src/tests/messagebus/CMakeLists.txt +++ b/messagebus/src/tests/messagebus/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_messagebus_test_app TEST messagebus.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_messagebus_test_app COMMAND messagebus_messagebus_test_app) diff --git a/messagebus/src/tests/messageordering/CMakeLists.txt b/messagebus/src/tests/messageordering/CMakeLists.txt index 7a429216d114..a6b1a2c1941a 100644 --- a/messagebus/src/tests/messageordering/CMakeLists.txt +++ b/messagebus/src/tests/messageordering/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_messageordering_test_app TEST messageordering.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test( NAME messagebus_messageordering_test_app diff --git a/messagebus/src/tests/messenger/CMakeLists.txt b/messagebus/src/tests/messenger/CMakeLists.txt index 633ee176062b..f8e9cb706686 100644 --- a/messagebus/src/tests/messenger/CMakeLists.txt +++ b/messagebus/src/tests/messenger/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_messenger_test_app TEST messenger.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_messenger_test_app COMMAND messagebus_messenger_test_app) diff --git a/messagebus/src/tests/protocolrepository/CMakeLists.txt b/messagebus/src/tests/protocolrepository/CMakeLists.txt index ae25e32a4cff..a6023b5f2cec 100644 --- a/messagebus/src/tests/protocolrepository/CMakeLists.txt +++ b/messagebus/src/tests/protocolrepository/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_protocolrepository_test_app TEST protocolrepository.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_protocolrepository_test_app NO_VALGRIND COMMAND messagebus_protocolrepository_test_app) diff --git a/messagebus/src/tests/queue/CMakeLists.txt b/messagebus/src/tests/queue/CMakeLists.txt index 097e5cc312a1..04f2b529ad05 100644 --- a/messagebus/src/tests/queue/CMakeLists.txt +++ b/messagebus/src/tests/queue/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_queue_test_app TEST queue.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_queue_test_app COMMAND messagebus_queue_test_app) diff --git a/messagebus/src/tests/replygate/CMakeLists.txt b/messagebus/src/tests/replygate/CMakeLists.txt index 5d503c0ca18d..a651fe2741b2 100644 --- a/messagebus/src/tests/replygate/CMakeLists.txt +++ b/messagebus/src/tests/replygate/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_replygate_test_app TEST replygate.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_replygate_test_app COMMAND messagebus_replygate_test_app) diff --git a/messagebus/src/tests/resender/CMakeLists.txt b/messagebus/src/tests/resender/CMakeLists.txt index c364806b2dd0..5bc0645ce528 100644 --- a/messagebus/src/tests/resender/CMakeLists.txt +++ b/messagebus/src/tests/resender/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_resender_test_app TEST resender.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_resender_test_app COMMAND messagebus_resender_test_app) diff --git a/messagebus/src/tests/result/CMakeLists.txt b/messagebus/src/tests/result/CMakeLists.txt index d4360f3826b5..056727162b3e 100644 --- a/messagebus/src/tests/result/CMakeLists.txt +++ b/messagebus/src/tests/result/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_result_test_app TEST result.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_result_test_app COMMAND messagebus_result_test_app) diff --git a/messagebus/src/tests/retrypolicy/CMakeLists.txt b/messagebus/src/tests/retrypolicy/CMakeLists.txt index 2ef419109e0c..62d2f97d8562 100644 --- a/messagebus/src/tests/retrypolicy/CMakeLists.txt +++ b/messagebus/src/tests/retrypolicy/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_retrypolicy_test_app TEST retrypolicy.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_retrypolicy_test_app COMMAND messagebus_retrypolicy_test_app) diff --git a/messagebus/src/tests/routable/CMakeLists.txt b/messagebus/src/tests/routable/CMakeLists.txt index 4641462c4f5b..a677148e3402 100644 --- a/messagebus/src/tests/routable/CMakeLists.txt +++ b/messagebus/src/tests/routable/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_routable_test_app TEST routable.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_routable_test_app COMMAND messagebus_routable_test_app) diff --git a/messagebus/src/tests/routablequeue/CMakeLists.txt b/messagebus/src/tests/routablequeue/CMakeLists.txt index 70f8ca6a993b..b25388f84c65 100644 --- a/messagebus/src/tests/routablequeue/CMakeLists.txt +++ b/messagebus/src/tests/routablequeue/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_routablequeue_test_app TEST routablequeue.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_routablequeue_test_app COMMAND messagebus_routablequeue_test_app) diff --git a/messagebus/src/tests/routeparser/CMakeLists.txt b/messagebus/src/tests/routeparser/CMakeLists.txt index 6c715d49f730..9e213a2c778e 100644 --- a/messagebus/src/tests/routeparser/CMakeLists.txt +++ b/messagebus/src/tests/routeparser/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_routeparser_test_app TEST routeparser.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_routeparser_test_app COMMAND messagebus_routeparser_test_app) diff --git a/messagebus/src/tests/routing/CMakeLists.txt b/messagebus/src/tests/routing/CMakeLists.txt index 6b013f7b9cc0..2f1427affcd3 100644 --- a/messagebus/src/tests/routing/CMakeLists.txt +++ b/messagebus/src/tests/routing/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_routing_test_app TEST routing.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_routing_test_app COMMAND messagebus_routing_test_app) diff --git a/messagebus/src/tests/routingcontext/CMakeLists.txt b/messagebus/src/tests/routingcontext/CMakeLists.txt index 932d0020a3e4..e4f8ff035065 100644 --- a/messagebus/src/tests/routingcontext/CMakeLists.txt +++ b/messagebus/src/tests/routingcontext/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_routingcontext_test_app TEST routingcontext.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_routingcontext_test_app COMMAND messagebus_routingcontext_test_app) diff --git a/messagebus/src/tests/routingspec/CMakeLists.txt b/messagebus/src/tests/routingspec/CMakeLists.txt index c7115c16fd99..96eee2362f7e 100644 --- a/messagebus/src/tests/routingspec/CMakeLists.txt +++ b/messagebus/src/tests/routingspec/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_routingspec_test_app TEST routingspec.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_routingspec_test_app COMMAND messagebus_routingspec_test_app) diff --git a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt b/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt index 9d9d0ded659d..459d70aaf50d 100644 --- a/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt +++ b/messagebus/src/tests/rpcserviceaddress/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_rpcserviceaddress_test_app TEST rpcserviceaddress.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_rpcserviceaddress_test_app COMMAND messagebus_rpcserviceaddress_test_app) diff --git a/messagebus/src/tests/sendadapter/CMakeLists.txt b/messagebus/src/tests/sendadapter/CMakeLists.txt index 9b73f2821570..91042d35e59b 100644 --- a/messagebus/src/tests/sendadapter/CMakeLists.txt +++ b/messagebus/src/tests/sendadapter/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_sendadapter_test_app TEST sendadapter.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_sendadapter_test_app COMMAND messagebus_sendadapter_test_app) diff --git a/messagebus/src/tests/sequencer/CMakeLists.txt b/messagebus/src/tests/sequencer/CMakeLists.txt index 0c00209f3c7f..8f08e191d37d 100644 --- a/messagebus/src/tests/sequencer/CMakeLists.txt +++ b/messagebus/src/tests/sequencer/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_sequencer_test_app TEST sequencer.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_sequencer_test_app COMMAND messagebus_sequencer_test_app) diff --git a/messagebus/src/tests/serviceaddress/CMakeLists.txt b/messagebus/src/tests/serviceaddress/CMakeLists.txt index 9c7315dfdbde..30356fb09adc 100644 --- a/messagebus/src/tests/serviceaddress/CMakeLists.txt +++ b/messagebus/src/tests/serviceaddress/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_serviceaddress_test_app TEST serviceaddress.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_serviceaddress_test_app COMMAND messagebus_serviceaddress_test_app) diff --git a/messagebus/src/tests/servicepool/CMakeLists.txt b/messagebus/src/tests/servicepool/CMakeLists.txt index 75886af2f69a..91efbba237b4 100644 --- a/messagebus/src/tests/servicepool/CMakeLists.txt +++ b/messagebus/src/tests/servicepool/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_servicepool_test_app TEST servicepool.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_servicepool_test_app COMMAND messagebus_servicepool_test_app) diff --git a/messagebus/src/tests/shutdown/CMakeLists.txt b/messagebus/src/tests/shutdown/CMakeLists.txt index 01d6df111fb1..ed2837a1ddf4 100644 --- a/messagebus/src/tests/shutdown/CMakeLists.txt +++ b/messagebus/src/tests/shutdown/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_shutdown_test_app TEST shutdown.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_shutdown_test_app COMMAND messagebus_shutdown_test_app) diff --git a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt b/messagebus/src/tests/simple-roundtrip/CMakeLists.txt index c0fc2b6a2929..a2b6875970e5 100644 --- a/messagebus/src/tests/simple-roundtrip/CMakeLists.txt +++ b/messagebus/src/tests/simple-roundtrip/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_simple-roundtrip_test_app TEST simple-roundtrip.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_simple-roundtrip_test_app COMMAND messagebus_simple-roundtrip_test_app) diff --git a/messagebus/src/tests/simpleprotocol/CMakeLists.txt b/messagebus/src/tests/simpleprotocol/CMakeLists.txt index eaa7675d4a6e..bab4c105ff1f 100644 --- a/messagebus/src/tests/simpleprotocol/CMakeLists.txt +++ b/messagebus/src/tests/simpleprotocol/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_simpleprotocol_test_app TEST simpleprotocol.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_simpleprotocol_test_app COMMAND messagebus_simpleprotocol_test_app) diff --git a/messagebus/src/tests/slobrok/CMakeLists.txt b/messagebus/src/tests/slobrok/CMakeLists.txt index 52cfd22b986e..0ad5c62fbd7a 100644 --- a/messagebus/src/tests/slobrok/CMakeLists.txt +++ b/messagebus/src/tests/slobrok/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_slobrok_test_app TEST slobrok.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_slobrok_test_app COMMAND messagebus_slobrok_test_app) diff --git a/messagebus/src/tests/sourcesession/CMakeLists.txt b/messagebus/src/tests/sourcesession/CMakeLists.txt index 6f8b14667ee5..9319dc25b95c 100644 --- a/messagebus/src/tests/sourcesession/CMakeLists.txt +++ b/messagebus/src/tests/sourcesession/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_sourcesession_test_app TEST sourcesession.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_sourcesession_test_app COMMAND messagebus_sourcesession_test_app) diff --git a/messagebus/src/tests/targetpool/CMakeLists.txt b/messagebus/src/tests/targetpool/CMakeLists.txt index 72cb63edb99a..08aa6e299381 100644 --- a/messagebus/src/tests/targetpool/CMakeLists.txt +++ b/messagebus/src/tests/targetpool/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_targetpool_test_app TEST targetpool.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_targetpool_test_app COMMAND messagebus_targetpool_test_app) diff --git a/messagebus/src/tests/throttling/CMakeLists.txt b/messagebus/src/tests/throttling/CMakeLists.txt index 3ad0662d13bb..d283e6a8f720 100644 --- a/messagebus/src/tests/throttling/CMakeLists.txt +++ b/messagebus/src/tests/throttling/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_throttling_test_app TEST throttling.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_throttling_test_app COMMAND messagebus_throttling_test_app) diff --git a/messagebus/src/tests/timeout/CMakeLists.txt b/messagebus/src/tests/timeout/CMakeLists.txt index 4aa3458cb142..7b242a152dad 100644 --- a/messagebus/src/tests/timeout/CMakeLists.txt +++ b/messagebus/src/tests/timeout/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_add_executable(messagebus_timeout_test_app TEST timeout.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus GTest::gtest ) vespa_add_test(NAME messagebus_timeout_test_app COMMAND messagebus_timeout_test_app) diff --git a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt b/messagebus/src/tests/trace-roundtrip/CMakeLists.txt index 034a6d7dbd2d..6185198d6423 100644 --- a/messagebus/src/tests/trace-roundtrip/CMakeLists.txt +++ b/messagebus/src/tests/trace-roundtrip/CMakeLists.txt @@ -4,6 +4,6 @@ vespa_add_executable(messagebus_trace-roundtrip_test_app TEST trace-roundtrip.cpp DEPENDS messagebus_messagebus-test - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_trace-roundtrip_test_app COMMAND messagebus_trace-roundtrip_test_app) diff --git a/messagebus/src/vespa/messagebus/CMakeLists.txt b/messagebus/src/vespa/messagebus/CMakeLists.txt index d9562ee2b400..52a1678e9fba 100644 --- a/messagebus/src/vespa/messagebus/CMakeLists.txt +++ b/messagebus/src/vespa/messagebus/CMakeLists.txt @@ -1,5 +1,5 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -vespa_add_library(messagebus +vespa_add_library(vespa_messagebus SOURCES blob.cpp blobref.cpp @@ -36,5 +36,5 @@ vespa_add_library(messagebus INSTALL lib64 DEPENDS ) -vespa_generate_config(messagebus ../../main/config/messagebus.def) +vespa_generate_config(vespa_messagebus ../../main/config/messagebus.def) install_config_definition(../../main/config/messagebus.def messagebus.messagebus.def) diff --git a/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt b/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt index f2805c03f732..f632a78efed7 100644 --- a/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt +++ b/messagebus/src/vespa/messagebus/testlib/CMakeLists.txt @@ -11,6 +11,6 @@ vespa_add_library(messagebus_messagebus-test testserver.cpp INSTALL lib64 DEPENDS - messagebus + vespa_messagebus slobrok_slobrokserver ) diff --git a/messagebus_test/CMakeLists.txt b/messagebus_test/CMakeLists.txt index 337619274f8f..8510482c2015 100644 --- a/messagebus_test/CMakeLists.txt +++ b/messagebus_test/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_define_module( DEPENDS slobrok_slobrokserver - messagebus + vespa_messagebus APPS src/binref diff --git a/messagebus_test/src/tests/compile-cpp/CMakeLists.txt b/messagebus_test/src/tests/compile-cpp/CMakeLists.txt index d9f27944396e..3420786c0e79 100644 --- a/messagebus_test/src/tests/compile-cpp/CMakeLists.txt +++ b/messagebus_test/src/tests/compile-cpp/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(messagebus_test_compile-cpp_test_app TEST SOURCES compile-cpp.cpp DEPENDS - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_test_compile-cpp_test_app NO_VALGRIND COMMAND messagebus_test_compile-cpp_test_app) diff --git a/messagebus_test/src/tests/errorcodes/CMakeLists.txt b/messagebus_test/src/tests/errorcodes/CMakeLists.txt index 1c38ccb723fe..178265e1e60e 100644 --- a/messagebus_test/src/tests/errorcodes/CMakeLists.txt +++ b/messagebus_test/src/tests/errorcodes/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(messagebus_test_dumpcodes_app TEST SOURCES dumpcodes.cpp DEPENDS - messagebus + vespa_messagebus ) vespa_add_test(NAME messagebus_test_dumpcodes_app NO_VALGRIND COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/errorcodes_test.sh DEPENDS messagebus_test_dumpcodes_app) diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt index 7ace189755ec..ce22f85e7162 100644 --- a/searchcore/CMakeLists.txt +++ b/searchcore/CMakeLists.txt @@ -9,7 +9,7 @@ vespa_define_module( vespa_configdefinitions vespa_document searchlib - messagebus + vespa_messagebus persistence searchsummary fileacquirer diff --git a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt index 1c0fc93d24c8..a02cddb0d8c9 100644 --- a/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt +++ b/searchcore/src/vespa/searchcore/bmcluster/CMakeLists.txt @@ -51,5 +51,5 @@ vespa_add_library(searchcore_bmcluster STATIC searchcorespi storageserver_storageapp messagebus_messagebus-test - messagebus + vespa_messagebus ) diff --git a/storage/CMakeLists.txt b/storage/CMakeLists.txt index 4654aa7204ae..95d787d377f0 100644 --- a/storage/CMakeLists.txt +++ b/storage/CMakeLists.txt @@ -6,7 +6,7 @@ vespa_define_module( vespa_config vespa_configdefinitions vespalog - messagebus + vespa_messagebus vespa_documentapi vespa_document vespalib