diff options
31 files changed, 45 insertions, 45 deletions
diff --git a/config/CMakeLists.txt b/config/CMakeLists.txt index ce3ec92c38b..fe5b3329c28 100644 --- a/config/CMakeLists.txt +++ b/config/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_define_module( DEPENDS vespalib vespalog - fnet + vespa_fnet EXTERNAL_DEPENDS lz4 diff --git a/configd/src/apps/cmd/CMakeLists.txt b/configd/src/apps/cmd/CMakeLists.txt index 478de2e4298..ff590ffac5c 100644 --- a/configd/src/apps/cmd/CMakeLists.txt +++ b/configd/src/apps/cmd/CMakeLists.txt @@ -5,6 +5,6 @@ vespa_add_executable(configd_vespa-sentinel-cmd_app OUTPUT_NAME vespa-sentinel-cmd-bin INSTALL bin DEPENDS - fnet + vespa_fnet vespalib ) diff --git a/configd/src/apps/sentinel/CMakeLists.txt b/configd/src/apps/sentinel/CMakeLists.txt index e78184c0120..d232091ea8a 100644 --- a/configd/src/apps/sentinel/CMakeLists.txt +++ b/configd/src/apps/sentinel/CMakeLists.txt @@ -25,7 +25,7 @@ vespa_add_executable(configd_config-sentinel_app OUTPUT_NAME vespa-config-sentinel INSTALL sbin DEPENDS - fnet + vespa_fnet vespa_configdefinitions vespalib ) diff --git a/dist/vespa.spec b/dist/vespa.spec index 1ff85cae935..8b1a398c2f3 100644 --- a/dist/vespa.spec +++ b/dist/vespa.spec @@ -570,7 +570,7 @@ fi %endif %dir %{_prefix} %dir %{_prefix}/lib64 -%{_prefix}/lib64/libfnet.so +%{_prefix}/lib64/libvespa_fnet.so %{_prefix}/lib64/libvespadefaults.so %{_prefix}/lib64/libvespalib.so %{_prefix}/lib64/libvespalog.so @@ -581,7 +581,7 @@ fi %endif %dir %{_prefix} %{_prefix}/lib64 -%exclude %{_prefix}/lib64/libfnet.so +%exclude %{_prefix}/lib64/libvespa_fnet.so %exclude %{_prefix}/lib64/libvespadefaults.so %exclude %{_prefix}/lib64/libvespalib.so %exclude %{_prefix}/lib64/libvespalog.so diff --git a/documentapi/CMakeLists.txt b/documentapi/CMakeLists.txt index 46bdc4c91a2..2ddb2c3c528 100644 --- a/documentapi/CMakeLists.txt +++ b/documentapi/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_define_module( vespalog vespa_config vespalib - fnet + vespa_fnet vespa_document slobrok messagebus diff --git a/fnet/src/examples/frt/rpc/CMakeLists.txt b/fnet/src/examples/frt/rpc/CMakeLists.txt index 8bbef0531b1..1268af42306 100644 --- a/fnet/src/examples/frt/rpc/CMakeLists.txt +++ b/fnet/src/examples/frt/rpc/CMakeLists.txt @@ -3,19 +3,19 @@ vespa_add_executable(fnet_rpc_server_app SOURCES rpc_server.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_rpc_client_app SOURCES rpc_client.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_echo_client_app SOURCES echo_client.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_rpc_info_app SOURCES @@ -23,19 +23,19 @@ vespa_add_executable(fnet_rpc_info_app OUTPUT_NAME vespa-rpc-info INSTALL bin DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_rpc_callback_server_app SOURCES rpc_callback_server.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_rpc_callback_client_app SOURCES rpc_callback_client.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_rpc_invoke_app SOURCES @@ -43,5 +43,5 @@ vespa_add_executable(fnet_rpc_invoke_app OUTPUT_NAME vespa-rpc-invoke-bin INSTALL bin DEPENDS - fnet + vespa_fnet ) diff --git a/fnet/src/examples/ping/CMakeLists.txt b/fnet/src/examples/ping/CMakeLists.txt index 8256fcefe28..f215fbe7426 100644 --- a/fnet/src/examples/ping/CMakeLists.txt +++ b/fnet/src/examples/ping/CMakeLists.txt @@ -4,12 +4,12 @@ vespa_add_executable(fnet_pingserver_app packets.cpp pingserver.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_executable(fnet_pingclient_app SOURCES packets.cpp pingclient.cpp DEPENDS - fnet + vespa_fnet ) diff --git a/fnet/src/examples/timeout/CMakeLists.txt b/fnet/src/examples/timeout/CMakeLists.txt index 28b74bbc3b8..944d3f143d9 100644 --- a/fnet/src/examples/timeout/CMakeLists.txt +++ b/fnet/src/examples/timeout/CMakeLists.txt @@ -3,5 +3,5 @@ vespa_add_executable(fnet_timeout_app SOURCES timeout.cpp DEPENDS - fnet + vespa_fnet ) diff --git a/fnet/src/tests/connect/CMakeLists.txt b/fnet/src/tests/connect/CMakeLists.txt index 41702292744..eeaa8f9b410 100644 --- a/fnet/src/tests/connect/CMakeLists.txt +++ b/fnet/src/tests/connect/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_connect_test_app TEST SOURCES connect_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_connect_test_app COMMAND fnet_connect_test_app) diff --git a/fnet/src/tests/connection_spread/CMakeLists.txt b/fnet/src/tests/connection_spread/CMakeLists.txt index 12ad0ab87bb..e221a194c76 100644 --- a/fnet/src/tests/connection_spread/CMakeLists.txt +++ b/fnet/src/tests/connection_spread/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_connection_spread_test_app TEST SOURCES connection_spread_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_connection_spread_test_app COMMAND fnet_connection_spread_test_app) diff --git a/fnet/src/tests/databuffer/CMakeLists.txt b/fnet/src/tests/databuffer/CMakeLists.txt index 9f5232b62a6..781abd2703e 100644 --- a/fnet/src/tests/databuffer/CMakeLists.txt +++ b/fnet/src/tests/databuffer/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_databuffer_test_app TEST SOURCES databuffer.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_databuffer_test_app COMMAND fnet_databuffer_test_app) diff --git a/fnet/src/tests/examples/CMakeLists.txt b/fnet/src/tests/examples/CMakeLists.txt index 2260bc1c323..f6d73849a0e 100644 --- a/fnet/src/tests/examples/CMakeLists.txt +++ b/fnet/src/tests/examples/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_examples_test_app TEST SOURCES examples_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_examples_test_app NO_VALGRIND COMMAND fnet_examples_test_app) diff --git a/fnet/src/tests/frt/detach_supervisor/CMakeLists.txt b/fnet/src/tests/frt/detach_supervisor/CMakeLists.txt index 3535a469ce8..5aa1febdbb3 100644 --- a/fnet/src/tests/frt/detach_supervisor/CMakeLists.txt +++ b/fnet/src/tests/frt/detach_supervisor/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_detach_supervisor_test_app TEST SOURCES detach_supervisor_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_detach_supervisor_test_app COMMAND fnet_detach_supervisor_test_app) diff --git a/fnet/src/tests/frt/method_pt/CMakeLists.txt b/fnet/src/tests/frt/method_pt/CMakeLists.txt index 17884a8b2d0..9ffce297edf 100644 --- a/fnet/src/tests/frt/method_pt/CMakeLists.txt +++ b/fnet/src/tests/frt/method_pt/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_method_pt_test_app TEST SOURCES method_pt.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_method_pt_test_app COMMAND fnet_method_pt_test_app) diff --git a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt b/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt index 6a89f7bebc2..5c55fefeeb6 100644 --- a/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt +++ b/fnet/src/tests/frt/parallel_rpc/CMakeLists.txt @@ -3,13 +3,13 @@ vespa_add_executable(fnet_parallel_rpc_test_app TEST SOURCES parallel_rpc_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_parallel_rpc_test_app COMMAND fnet_parallel_rpc_test_app) vespa_add_executable(fnet_tls_rpc_bench_app TEST SOURCES tls_rpc_bench.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_tls_rpc_bench_app COMMAND fnet_tls_rpc_bench_app BENCHMARK) diff --git a/fnet/src/tests/frt/rpc/CMakeLists.txt b/fnet/src/tests/frt/rpc/CMakeLists.txt index e424bcee590..48292a2df56 100644 --- a/fnet/src/tests/frt/rpc/CMakeLists.txt +++ b/fnet/src/tests/frt/rpc/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(fnet_invoke_test_app TEST SOURCES invoke.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_invoke_test_app COMMAND fnet_invoke_test_app) vespa_add_test(NAME fnet_invoke_test_app_tls COMMAND fnet_invoke_test_app ENVIRONMENT "CRYPTOENGINE=tls") @@ -19,13 +19,13 @@ vespa_add_executable(fnet_detach_return_invoke_test_app TEST SOURCES detach_return_invoke.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_detach_return_invoke_test_app COMMAND fnet_detach_return_invoke_test_app) vespa_add_executable(fnet_sharedblob_test_app TEST SOURCES sharedblob.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_sharedblob_test_app COMMAND fnet_sharedblob_test_app) diff --git a/fnet/src/tests/frt/values/CMakeLists.txt b/fnet/src/tests/frt/values/CMakeLists.txt index 62b3e44a19a..31ffc80af46 100644 --- a/fnet/src/tests/frt/values/CMakeLists.txt +++ b/fnet/src/tests/frt/values/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_values_test_app TEST SOURCES values_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_values_test_app COMMAND fnet_values_test_app) diff --git a/fnet/src/tests/info/CMakeLists.txt b/fnet/src/tests/info/CMakeLists.txt index aa7570cd2f3..ea4c1e0a48c 100644 --- a/fnet/src/tests/info/CMakeLists.txt +++ b/fnet/src/tests/info/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_info_test_app TEST SOURCES info.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_info_test_app COMMAND fnet_info_test_app) diff --git a/fnet/src/tests/locking/CMakeLists.txt b/fnet/src/tests/locking/CMakeLists.txt index 854be39801e..e4b69a653fa 100644 --- a/fnet/src/tests/locking/CMakeLists.txt +++ b/fnet/src/tests/locking/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_add_executable(fnet_drainpackets_test_app TEST SOURCES drainpackets.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_drainpackets_test_app NO_VALGRIND COMMAND fnet_drainpackets_test_app) vespa_add_executable(fnet_lockspeed_test_app TEST @@ -11,13 +11,13 @@ vespa_add_executable(fnet_lockspeed_test_app TEST lockspeed.cpp dummy.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_lockspeed_test_app NO_VALGRIND COMMAND fnet_lockspeed_test_app) vespa_add_executable(fnet_castspeed_test_app TEST SOURCES castspeed.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_castspeed_test_app NO_VALGRIND COMMAND fnet_castspeed_test_app) diff --git a/fnet/src/tests/printstuff/CMakeLists.txt b/fnet/src/tests/printstuff/CMakeLists.txt index 30d10f4d98c..65e585eace5 100644 --- a/fnet/src/tests/printstuff/CMakeLists.txt +++ b/fnet/src/tests/printstuff/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_printstuff_test_app TEST SOURCES printstuff_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_printstuff_test_app COMMAND fnet_printstuff_test_app) diff --git a/fnet/src/tests/scheduling/CMakeLists.txt b/fnet/src/tests/scheduling/CMakeLists.txt index 224581eda98..16e9930bb97 100644 --- a/fnet/src/tests/scheduling/CMakeLists.txt +++ b/fnet/src/tests/scheduling/CMakeLists.txt @@ -3,13 +3,13 @@ vespa_add_executable(fnet_schedule_test_app TEST SOURCES schedule.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_schedule_test_app COMMAND fnet_schedule_test_app) vespa_add_executable(fnet_sloweventloop_test_app TEST SOURCES sloweventloop.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_sloweventloop_test_app COMMAND fnet_sloweventloop_test_app) diff --git a/fnet/src/tests/sync_execute/CMakeLists.txt b/fnet/src/tests/sync_execute/CMakeLists.txt index c0482977b0d..29e955875b6 100644 --- a/fnet/src/tests/sync_execute/CMakeLists.txt +++ b/fnet/src/tests/sync_execute/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_sync_execute_test_app TEST SOURCES sync_execute.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_sync_execute_test_app COMMAND fnet_sync_execute_test_app) diff --git a/fnet/src/tests/thread_selection/CMakeLists.txt b/fnet/src/tests/thread_selection/CMakeLists.txt index 428437b0ec0..ec474f73fae 100644 --- a/fnet/src/tests/thread_selection/CMakeLists.txt +++ b/fnet/src/tests/thread_selection/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_thread_selection_test_app TEST SOURCES thread_selection_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_thread_selection_test_app COMMAND fnet_thread_selection_test_app) diff --git a/fnet/src/tests/time/CMakeLists.txt b/fnet/src/tests/time/CMakeLists.txt index 6276286dd8a..0f2c7c3c5c3 100644 --- a/fnet/src/tests/time/CMakeLists.txt +++ b/fnet/src/tests/time/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_timespeed_test_app TEST SOURCES timespeed.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_timespeed_test_app NO_VALGRIND COMMAND fnet_timespeed_test_app) diff --git a/fnet/src/tests/transport_debugger/CMakeLists.txt b/fnet/src/tests/transport_debugger/CMakeLists.txt index a5aebcdbc93..b252c408288 100644 --- a/fnet/src/tests/transport_debugger/CMakeLists.txt +++ b/fnet/src/tests/transport_debugger/CMakeLists.txt @@ -3,6 +3,6 @@ vespa_add_executable(fnet_transport_debugger_test_app TEST SOURCES transport_debugger_test.cpp DEPENDS - fnet + vespa_fnet ) vespa_add_test(NAME fnet_transport_debugger_test_app COMMAND fnet_transport_debugger_test_app) diff --git a/fnet/src/vespa/fnet/CMakeLists.txt b/fnet/src/vespa/fnet/CMakeLists.txt index 3e829785544..492a48c4f33 100644 --- a/fnet/src/vespa/fnet/CMakeLists.txt +++ b/fnet/src/vespa/fnet/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(fnet +vespa_add_library(vespa_fnet SOURCES channel.cpp channellookup.cpp diff --git a/jrt_test/CMakeLists.txt b/jrt_test/CMakeLists.txt index 9118ce5c3b9..d55891e7f90 100644 --- a/jrt_test/CMakeLists.txt +++ b/jrt_test/CMakeLists.txt @@ -3,7 +3,7 @@ vespa_define_module( DEPENDS vespalog vespalib - fnet + vespa_fnet slobrok vespa_configdefinitions diff --git a/messagebus/CMakeLists.txt b/messagebus/CMakeLists.txt index 1cbbe60775a..6af39e9cd18 100644 --- a/messagebus/CMakeLists.txt +++ b/messagebus/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_define_module( vespalog vespa_config vespalib - fnet + vespa_fnet slobrok LIBS diff --git a/searchcore/CMakeLists.txt b/searchcore/CMakeLists.txt index 7a9e187159a..7ace189755e 100644 --- a/searchcore/CMakeLists.txt +++ b/searchcore/CMakeLists.txt @@ -1,7 +1,7 @@ # Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. vespa_define_module( DEPENDS - fnet + vespa_fnet vespalog vespalib metrics diff --git a/searchlib/CMakeLists.txt b/searchlib/CMakeLists.txt index ea40934a56b..b7fc23fb1a1 100644 --- a/searchlib/CMakeLists.txt +++ b/searchlib/CMakeLists.txt @@ -4,7 +4,7 @@ vespa_define_module( vespalog vespalib vespaeval - fnet + vespa_fnet vespa_configdefinitions metrics vespa_document diff --git a/slobrok/CMakeLists.txt b/slobrok/CMakeLists.txt index d5c9fa6b85b..c72c9b27adc 100644 --- a/slobrok/CMakeLists.txt +++ b/slobrok/CMakeLists.txt @@ -2,7 +2,7 @@ vespa_define_module( DEPENDS vespalib - fnet + vespa_fnet vespa_configdefinitions LIBS |