From f92cf9b870e8234188f40e2783adda8deac749c2 Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Wed, 14 Aug 2024 17:19:14 -0400 Subject: [PATCH] =?UTF-8?q?squash!=20General=20CMakeLists=20improvements?= =?UTF-8?q?=20-=20cmake=20v2=E2=86=92v3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixed include to interal.hpp, removed variable target name for main libs, applying OS options better, got tests building --- CMakeLists.txt | 18 +- test/CMakeLists.txt | 26 +- test/benchmark_tests/CMakeLists.txt | 7 +- test/common/CMakeLists.txt | 2 +- .../CMakeLists.txt | 7 +- test/network_tests/CMakeLists.txt | 498 +++++++++--------- .../offer_tests/offer_test_client.cpp | 2 +- .../offered_services_info_test_client.cpp | 2 +- .../offered_services_info_test_service.cpp | 2 +- test/unit_tests/CMakeLists.txt | 7 +- 10 files changed, 286 insertions(+), 285 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b715695e7..820c69f21 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -141,11 +141,9 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") # This is only relevant for GCC and causes warnings on Clang - add_link_options( - -Wl,-z,relro,-z,now -Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc - ) + target_link_options(OS_INTERFACE INTERFACE -Wl,-z,relro,-z,now -Wl,-export-dynamic -Wl,--version-script=${CMAKE_CURRENT_SOURCE_DIR}/exportmap.gcc) endif() - add_link_options(-Wl,--wrap=socket,--wrap=accept,--wrap=open) + target_link_options(OS_INTERFACE INTERFACE -Wl,--wrap=socket,--wrap=accept,--wrap=open) # force all use of std::mutex and std::recursive_mutex to use runtime init instead of static initialization so mutexes # can be hooked to enable PI as needed @@ -176,8 +174,8 @@ elseif(${CMAKE_SYSTEM_NAME} MATCHES "QNX") -fasynchronous-unwind-tables -fno-omit-frame-pointer ) - add_link_options(-Wl,-export-dynamic) - add_link_options(-Wl,--wrap=socket,--wrap=accept,--wrap=open) + target_link_options(OS_INTERFACE INTERFACE -Wl,-export-dynamic) + target_link_options(OS_INTERFACE INTERFACE -Wl,--wrap=socket,--wrap=accept,--wrap=open) target_link_libraries(OS_INTERFACE INTERFACE slog2) @@ -354,6 +352,12 @@ if(NOT ENABLE_MULTIPLE_ROUTING_MANAGERS) DL_INTERFACE OS_INTERFACE ) +else() + # We don't want this target to only conditionally exist. + add_library(vsomeip3-cfg INTERFACE) + message(STATUS "Multiple routing managers enabled, \"disabling\" the + configuration library. Note that the unittests depend on this library so you + won't likely be able to use the tests in this mode") endif() # ###################################################################################################################### @@ -428,7 +432,7 @@ target_link_libraries( ) if(NOT WIN32) - target_link_options(${VSOMEIP_NAME} PRIVATE "LINKER:-as-needed") + target_link_options(vsomeip3 PRIVATE "LINKER:-as-needed") endif() # ###################################################################################################################### diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt index f66ac5d33..41e6d16ad 100644 --- a/test/CMakeLists.txt +++ b/test/CMakeLists.txt @@ -14,8 +14,16 @@ find_package(benchmark) ############################################################################## # google test -# remove export symbols from the cxx flags -string(REPLACE "${EXPORTSYMBOLS}" "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +# remove export symbols from the cxx flags. This is messy, but there's no `remove_link_flags` function +get_target_property(os_link_options OS_INTERFACE INTERFACE_LINK_OPTIONS) +foreach(opt IN ITEMS ${os_link_options}) + if(opt MATCHES ".*version.script.*.gcc") + list(REMOVE_ITEM os_link_options ${opt}) + endif() +endforeach() +unset(opt) +set_target_properties(OS_INTERFACE PROPERTIES INTERFACE_LINK_OPTIONS "${os_link_options}") +unset(os_link_options) # check for set environment variable if(${GTEST_ROOT} STREQUAL "n/a") @@ -107,19 +115,19 @@ add_custom_target(check COMMAND ${CMAKE_CTEST_COMMAND}) add_dependencies(check build_tests) add_custom_target(build_network_tests) -add_dependencies(build_network_tests ${VSOMEIP_NAME}) -add_dependencies(build_network_tests ${VSOMEIP_NAME}-e2e) -add_dependencies(build_network_tests ${VSOMEIP_NAME}-sd) +add_dependencies(build_network_tests vsomeip3) +add_dependencies(build_network_tests vsomeip3-e2e) +add_dependencies(build_network_tests vsomeip3-sd) add_dependencies(build_tests build_network_tests) add_custom_target(build_unit_tests) -add_dependencies(build_unit_tests ${VSOMEIP_NAME}) -add_dependencies(build_unit_tests ${VSOMEIP_NAME}-sd) +add_dependencies(build_unit_tests vsomeip3) +add_dependencies(build_unit_tests vsomeip3-sd) add_dependencies(build_tests build_unit_tests) add_custom_target(build_benchmark_tests) -add_dependencies(build_benchmark_tests ${VSOMEIP_NAME}) -add_dependencies(build_benchmark_tests ${VSOMEIP_NAME}-sd) +add_dependencies(build_benchmark_tests vsomeip3) +add_dependencies(build_benchmark_tests vsomeip3-sd) add_dependencies(build_tests build_benchmark_tests) ############################################################################## diff --git a/test/benchmark_tests/CMakeLists.txt b/test/benchmark_tests/CMakeLists.txt index 2801544cd..338cf783c 100644 --- a/test/benchmark_tests/CMakeLists.txt +++ b/test/benchmark_tests/CMakeLists.txt @@ -14,12 +14,6 @@ file( set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) -find_package( - Boost 1.65 - COMPONENTS filesystem system - REQUIRED -) # ---------------------------------------------------------------------------- # Executable and libraries to link @@ -30,6 +24,7 @@ target_link_libraries( vsomeip3-benchmark-tests PRIVATE vsomeip3 vsomeip3-cfg + vsomeip_utilities Threads::Threads Boost::filesystem Boost::system diff --git a/test/common/CMakeLists.txt b/test/common/CMakeLists.txt index d4d145347..8ef792a21 100644 --- a/test/common/CMakeLists.txt +++ b/test/common/CMakeLists.txt @@ -34,7 +34,7 @@ TARGET_LINK_LIBRARIES ( # by this library # ---------------------------------------------------------------------------- target_include_directories ( - ${PROJECT_NAME} + vsomeip_utilities PUBLIC include PRIVATE src ) diff --git a/test/internal_routing_disabled_acceptance_test/CMakeLists.txt b/test/internal_routing_disabled_acceptance_test/CMakeLists.txt index 574c6981b..6e3a009a2 100644 --- a/test/internal_routing_disabled_acceptance_test/CMakeLists.txt +++ b/test/internal_routing_disabled_acceptance_test/CMakeLists.txt @@ -7,18 +7,15 @@ endif() project(internal_routing_disabled_acceptance_test LANGUAGES CXX) -set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -Wconversion -Wextra") +add_compile_options(-pedantic -Wall -Wconversion -Wextra) set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) set(CMAKE_CXX_EXTENSIONS OFF) set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) -find_package(Boost 1.55 COMPONENTS system REQUIRED) - add_executable(${PROJECT_NAME} applet.cpp client.cpp server.cpp main.cpp) target_include_directories(${PROJECT_NAME} PRIVATE ${gtest_SOURCE_DIR}/include) -target_link_libraries(${PROJECT_NAME} PRIVATE gtest Threads::Threads vsomeip3 ${Boost_LIBRARIES}) +target_link_libraries(${PROJECT_NAME} PRIVATE gtest Threads::Threads vsomeip3 Boost::system) if (${CMAKE_SYSTEM_NAME} MATCHES "QNX") target_compile_definitions(${PROJECT_NAME} PRIVATE _QNX_SOURCE) diff --git a/test/network_tests/CMakeLists.txt b/test/network_tests/CMakeLists.txt index 883cc5cf8..94d4d68c4 100644 --- a/test/network_tests/CMakeLists.txt +++ b/test/network_tests/CMakeLists.txt @@ -78,10 +78,10 @@ if(NOT ${TESTS_BAT}) ${PROJECT_SOURCE_DIR}/implementation/plugin/src/plugin_manager_impl.cpp ) target_link_libraries(${TEST_CONFIGURATION} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -108,9 +108,9 @@ set(TEST_APPLICATION application_test) add_executable(${TEST_APPLICATION} application_tests/${TEST_APPLICATION}.cpp) target_link_libraries(${TEST_APPLICATION} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -119,9 +119,9 @@ if(NOT ${TESTS_BAT}) set(TEST_APPLICATION_SINGLE_PROCESS_NAME ${TEST_APPLICATION}_single_process) add_executable(${TEST_APPLICATION_SINGLE_PROCESS_NAME} application_tests/${TEST_APPLICATION_SINGLE_PROCESS_NAME}.cpp) target_link_libraries(${TEST_APPLICATION_SINGLE_PROCESS_NAME} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -133,9 +133,9 @@ if(NOT ${TESTS_BAT}) set(TEST_APPLICATION_AVAILABILITY_NAME ${TEST_APPLICATION}_availability) add_executable(${TEST_APPLICATION_AVAILABILITY_NAME} application_tests/${TEST_APPLICATION_AVAILABILITY_NAME}.cpp) target_link_libraries(${TEST_APPLICATION_AVAILABILITY_NAME} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -222,9 +222,9 @@ if(NOT ${TESTS_BAT}) set(TEST_MAGIC_COOKIES_CLIENT ${TEST_MAGIC_COOKIES_NAME}_client) add_executable(${TEST_MAGIC_COOKIES_CLIENT} magic_cookies_tests/${TEST_MAGIC_COOKIES_CLIENT}.cpp) target_link_libraries(${TEST_MAGIC_COOKIES_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${CMAKE_THREAD_LIBS_INIT} ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} @@ -234,9 +234,9 @@ if(NOT ${TESTS_BAT}) set(TEST_MAGIC_COOKIES_SERVICE ${TEST_MAGIC_COOKIES_NAME}_service) add_executable(${TEST_MAGIC_COOKIES_SERVICE} magic_cookies_tests/${TEST_MAGIC_COOKIES_SERVICE}.cpp) target_link_libraries(${TEST_MAGIC_COOKIES_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${DLT_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT} ${TEST_LINK_LIBRARIES} @@ -295,9 +295,9 @@ set(TEST_HEADER_FACTORY_NAME header_factory_test) set(TEST_HEADER_FACTORY header_factory_test) add_executable(${TEST_HEADER_FACTORY} header_factory_tests/header_factory_test.cpp) target_link_libraries(${TEST_HEADER_FACTORY} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${CMAKE_THREAD_LIBS_INIT} ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} @@ -310,9 +310,9 @@ target_link_libraries(${TEST_HEADER_FACTORY} set(TEST_HEADER_FACTORY_CLIENT header_factory_test_client) add_executable(${TEST_HEADER_FACTORY_CLIENT} header_factory_tests/${TEST_HEADER_FACTORY_CLIENT}.cpp) target_link_libraries(${TEST_HEADER_FACTORY_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${CMAKE_THREAD_LIBS_INIT} ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} @@ -336,9 +336,9 @@ copy_to_builddir(${NETWORK_TEST_SRC_DIR}/header_factory_tests/${TEST_HEADER_FACT set(TEST_HEADER_FACTORY_SERVICE header_factory_test_service) add_executable(${TEST_HEADER_FACTORY_SERVICE} header_factory_tests/${TEST_HEADER_FACTORY_SERVICE}.cpp) target_link_libraries(${TEST_HEADER_FACTORY_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${CMAKE_THREAD_LIBS_INIT} ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} @@ -384,9 +384,9 @@ if(NOT ${TESTS_BAT}) set(TEST_LOCAL_ROUTING_SERVICE local_routing_test_service) add_executable(${TEST_LOCAL_ROUTING_SERVICE} routing_tests/${TEST_LOCAL_ROUTING_SERVICE}.cpp) target_link_libraries(${TEST_LOCAL_ROUTING_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -409,9 +409,9 @@ if(NOT ${TESTS_BAT}) set(TEST_LOCAL_ROUTING_CLIENT local_routing_test_client) add_executable(${TEST_LOCAL_ROUTING_CLIENT} routing_tests/${TEST_LOCAL_ROUTING_CLIENT}.cpp) target_link_libraries(${TEST_LOCAL_ROUTING_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -451,9 +451,9 @@ if(NOT ${TESTS_BAT}) set(TEST_EXTERNAL_LOCAL_ROUTING_SERVICE external_local_routing_test_service) add_executable(${TEST_EXTERNAL_LOCAL_ROUTING_SERVICE} routing_tests/${TEST_EXTERNAL_LOCAL_ROUTING_SERVICE}.cpp) target_link_libraries(${TEST_EXTERNAL_LOCAL_ROUTING_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -511,9 +511,9 @@ else() set(TEST_LOCAL_ROUTING_SERVICE local_routing_test_service) add_executable(${TEST_LOCAL_ROUTING_SERVICE} routing_tests/${TEST_LOCAL_ROUTING_SERVICE}.cpp) target_link_libraries(${TEST_LOCAL_ROUTING_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -536,9 +536,9 @@ else() set(TEST_LOCAL_ROUTING_CLIENT local_routing_test_client) add_executable(${TEST_LOCAL_ROUTING_CLIENT} routing_tests/${TEST_LOCAL_ROUTING_CLIENT}.cpp) target_link_libraries(${TEST_LOCAL_ROUTING_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -579,9 +579,9 @@ if(NOT ${TESTS_BAT}) set(TEST_RESTART_ROUTING_SERVICE restart_routing_test_service) add_executable(${TEST_RESTART_ROUTING_SERVICE} restart_routing_tests/${TEST_RESTART_ROUTING_SERVICE}.cpp) target_link_libraries(${TEST_RESTART_ROUTING_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -608,9 +608,9 @@ if(NOT ${TESTS_BAT}) restart_routing_tests/${TEST_RESTART_ROUTING_CLIENT}.cpp ) target_link_libraries(${TEST_RESTART_ROUTING_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -660,9 +660,9 @@ if (${TEST_SECURITY}) add_executable(${TEST_SECURITY_SERVICE} security_tests/${TEST_SECURITY_SERVICE}.cpp) target_link_libraries(${TEST_SECURITY_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -756,9 +756,9 @@ if (${TEST_SECURITY}) security_tests/${TEST_SECURITY_CLIENT}.cpp ) target_link_libraries(${TEST_SECURITY_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -775,9 +775,9 @@ set(TEST_LOCAL_PAYLOAD_NAME local_payload_test) set(TEST_PAYLOAD_SERVICE payload_test_service) add_executable(${TEST_PAYLOAD_SERVICE} payload_tests/${TEST_PAYLOAD_SERVICE}.cpp) target_link_libraries(${TEST_PAYLOAD_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -805,9 +805,9 @@ add_executable(${TEST_PAYLOAD_CLIENT} payload_tests/stopwatch.cpp ) target_link_libraries(${TEST_PAYLOAD_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -981,9 +981,9 @@ set(TEST_BIG_PAYLOAD_NAME big_payload_test) set(TEST_BIG_PAYLOAD_SERVICE big_payload_test_service) add_executable(${TEST_BIG_PAYLOAD_SERVICE} big_payload_tests/${TEST_BIG_PAYLOAD_SERVICE}.cpp) target_link_libraries(${TEST_BIG_PAYLOAD_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -992,9 +992,9 @@ target_link_libraries(${TEST_BIG_PAYLOAD_SERVICE} set(TEST_BIG_PAYLOAD_CLIENT big_payload_test_client) add_executable(${TEST_BIG_PAYLOAD_CLIENT} big_payload_tests/${TEST_BIG_PAYLOAD_CLIENT}.cpp) target_link_libraries(${TEST_BIG_PAYLOAD_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -1350,9 +1350,9 @@ if(NOT ${TESTS_BAT}) set(TEST_CLIENT_ID_SERVICE ${TEST_CLIENT_ID_NAME}_service) add_executable(${TEST_CLIENT_ID_SERVICE} client_id_tests/${TEST_CLIENT_ID_NAME}_service.cpp) target_link_libraries(${TEST_CLIENT_ID_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -1363,10 +1363,10 @@ if(NOT ${TESTS_BAT}) client_id_tests/${TEST_CLIENT_ID_UTILITY}.cpp) #${PROJECT_SOURCE_DIR}/implementation/utility/src/utility.cpp) target_link_libraries(${TEST_CLIENT_ID_UTILITY} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -1552,9 +1552,9 @@ if(NOT ${TESTS_BAT}) set(TEST_DEBOUNCE_CLIENT ${TEST_DEBOUNCE_NAME}_client) add_executable(${TEST_DEBOUNCE_CLIENT} debounce_tests/${TEST_DEBOUNCE_CLIENT}.cpp) target_link_libraries(${TEST_DEBOUNCE_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -1562,9 +1562,9 @@ if(NOT ${TESTS_BAT}) set(TEST_DEBOUNCE_SERVICE ${TEST_DEBOUNCE_NAME}_service) add_executable(${TEST_DEBOUNCE_SERVICE} debounce_tests/${TEST_DEBOUNCE_SERVICE}.cpp) target_link_libraries(${TEST_DEBOUNCE_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -1613,17 +1613,17 @@ if(NOT ${TESTS_BAT}) set(TEST_DEBOUNCE_FILTER_CLIENT ${TEST_DEBOUNCE_FILTER_NAME}_client) add_executable(${TEST_DEBOUNCE_FILTER_CLIENT} debounce_filter_tests/${TEST_DEBOUNCE_FILTER_CLIENT}.cpp) target_link_libraries(${TEST_DEBOUNCE_FILTER_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ) set(TEST_DEBOUNCE_FILTER_SERVICE ${TEST_DEBOUNCE_FILTER_NAME}_service) add_executable(${TEST_DEBOUNCE_FILTER_SERVICE} debounce_filter_tests/${TEST_DEBOUNCE_FILTER_SERVICE}.cpp) target_link_libraries(${TEST_DEBOUNCE_FILTER_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ) @@ -1670,18 +1670,18 @@ if(NOT ${TESTS_BAT}) set(TEST_DEBOUNCE_FREQUENCY_CLIENT ${TEST_DEBOUNCE_FREQUENCY_NAME}_client) add_executable(${TEST_DEBOUNCE_FREQUENCY_CLIENT} debounce_frequency_tests/${TEST_DEBOUNCE_FREQUENCY_CLIENT}.cpp) target_link_libraries(${TEST_DEBOUNCE_FREQUENCY_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} vsomeip_utilities ) set(TEST_DEBOUNCE_FREQUENCY_SERVICE ${TEST_DEBOUNCE_FREQUENCY_NAME}_service) add_executable(${TEST_DEBOUNCE_FREQUENCY_SERVICE} debounce_frequency_tests/${TEST_DEBOUNCE_FREQUENCY_SERVICE}.cpp) target_link_libraries(${TEST_DEBOUNCE_FREQUENCY_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} vsomeip_utilities ) @@ -1729,17 +1729,17 @@ if(NOT ${TESTS_BAT}) set(TEST_DEBOUNCE_CALLBACK_CLIENT ${TEST_DEBOUNCE_CALLBACK_NAME}_client) add_executable(${TEST_DEBOUNCE_CALLBACK_CLIENT} debounce_callback_tests/${TEST_DEBOUNCE_CALLBACK_CLIENT}.cpp) target_link_libraries(${TEST_DEBOUNCE_CALLBACK_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ) set(TEST_DEBOUNCE_CALLBACK_SERVICE ${TEST_DEBOUNCE_CALLBACK_NAME}_service) add_executable(${TEST_DEBOUNCE_CALLBACK_SERVICE} debounce_callback_tests/${TEST_DEBOUNCE_CALLBACK_SERVICE}.cpp) target_link_libraries(${TEST_DEBOUNCE_CALLBACK_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ) @@ -1786,9 +1786,9 @@ if(NOT ${TESTS_BAT}) set(TEST_SUBSCRIBE_NOTIFY_SERVICE ${TEST_SUBSCRIBE_NOTIFY_NAME}_service) add_executable(${TEST_SUBSCRIBE_NOTIFY_SERVICE} subscribe_notify_tests/${TEST_SUBSCRIBE_NOTIFY_NAME}_service.cpp) target_link_libraries(${TEST_SUBSCRIBE_NOTIFY_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2083,9 +2083,9 @@ if(NOT ${TESTS_BAT}) add_executable(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_SERVICE} subscribe_notify_tests/${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_SERVICE}.cpp) target_link_libraries(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2095,9 +2095,9 @@ if(NOT ${TESTS_BAT}) add_executable(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_CLIENT} subscribe_notify_tests/${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_CLIENT}.cpp) target_link_libraries(${TEST_SUBSCRIBE_NOTIFY_ONE_EVENT_TWO_EVENTGROUPS_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2486,9 +2486,9 @@ if(NOT ${TESTS_BAT}) set(TEST_SUBSCRIBE_NOTIFY_ONE_SERVICE ${TEST_SUBSCRIBE_NOTIFY_ONE_NAME}_service) add_executable(${TEST_SUBSCRIBE_NOTIFY_ONE_SERVICE} subscribe_notify_one_tests/${TEST_SUBSCRIBE_NOTIFY_ONE_NAME}_service.cpp) target_link_libraries(${TEST_SUBSCRIBE_NOTIFY_ONE_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2597,9 +2597,9 @@ if(NOT ${TESTS_BAT}) cpu_load_tests/cpu_load_measurer.cpp ) target_link_libraries(${TEST_CPU_LOAD_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2634,9 +2634,9 @@ if(NOT ${TESTS_BAT}) cpu_load_tests/cpu_load_measurer.cpp ) target_link_libraries(${TEST_CPU_LOAD_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2685,9 +2685,9 @@ if(NOT ${TESTS_BAT}) set(TEST_INITIAL_EVENT_SERVICE ${TEST_INITIAL_EVENT_NAME}_service) add_executable(${TEST_INITIAL_EVENT_SERVICE} initial_event_tests/${TEST_INITIAL_EVENT_NAME}_service.cpp) target_link_libraries(${TEST_INITIAL_EVENT_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2696,9 +2696,9 @@ if(NOT ${TESTS_BAT}) set(TEST_INITIAL_EVENT_CLIENT ${TEST_INITIAL_EVENT_NAME}_client) add_executable(${TEST_INITIAL_EVENT_CLIENT} initial_event_tests/${TEST_INITIAL_EVENT_NAME}_client.cpp) target_link_libraries(${TEST_INITIAL_EVENT_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2707,9 +2707,9 @@ if(NOT ${TESTS_BAT}) set(TEST_INITIAL_EVENT_AVAILABILITY_CHECKER ${TEST_INITIAL_EVENT_NAME}_availability_checker) add_executable(${TEST_INITIAL_EVENT_AVAILABILITY_CHECKER} initial_event_tests/${TEST_INITIAL_EVENT_NAME}_availability_checker.cpp) target_link_libraries(${TEST_INITIAL_EVENT_AVAILABILITY_CHECKER} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2718,9 +2718,9 @@ if(NOT ${TESTS_BAT}) set(TEST_INITIAL_EVENT_STOP_SERVICE ${TEST_INITIAL_EVENT_NAME}_stop_service) add_executable(${TEST_INITIAL_EVENT_STOP_SERVICE} initial_event_tests/${TEST_INITIAL_EVENT_NAME}_stop_service.cpp) target_link_libraries(${TEST_INITIAL_EVENT_STOP_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -2994,9 +2994,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFER_SERVICE ${TEST_OFFER_NAME}_service) add_executable(${TEST_OFFER_SERVICE} offer_tests/${TEST_OFFER_NAME}_service.cpp) target_link_libraries(${TEST_OFFER_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3005,9 +3005,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFER_MULTIPLE_OFFERING offer_test_multiple_offerings) add_executable(${TEST_OFFER_MULTIPLE_OFFERING} offer_tests/${TEST_OFFER_MULTIPLE_OFFERING}.cpp) target_link_libraries(${TEST_OFFER_MULTIPLE_OFFERING} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ) @@ -3030,9 +3030,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFER_CLIENT ${TEST_OFFER_NAME}_client) add_executable(${TEST_OFFER_CLIENT} offer_tests/${TEST_OFFER_NAME}_client.cpp) target_link_libraries(${TEST_OFFER_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3041,9 +3041,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFER_SERVICE_EXTERNAL ${TEST_OFFER_NAME}_service_external) add_executable(${TEST_OFFER_SERVICE_EXTERNAL} offer_tests/${TEST_OFFER_NAME}_service_external.cpp) target_link_libraries(${TEST_OFFER_SERVICE_EXTERNAL} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3052,8 +3052,8 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFER_EXTERNAL_SD_MESSAGE_SENDER ${TEST_OFFER_NAME}_external_sd_msg_sender) add_executable(${TEST_OFFER_EXTERNAL_SD_MESSAGE_SENDER} offer_tests/${TEST_OFFER_NAME}_external_sd_msg_sender.cpp) target_link_libraries(${TEST_OFFER_EXTERNAL_SD_MESSAGE_SENDER} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3064,9 +3064,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFER_BIG_SERVICE ${TEST_OFFER_BIG_NAME}_service) add_executable(${TEST_OFFER_BIG_SERVICE} offer_tests/${TEST_OFFER_BIG_NAME}_service.cpp) target_link_libraries(${TEST_OFFER_BIG_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3076,9 +3076,9 @@ if(NOT ${TESTS_BAT}) add_executable(${TEST_OFFER_BIG_CLIENT} offer_tests/${TEST_OFFER_BIG_NAME}_client.cpp) target_link_libraries(${TEST_OFFER_BIG_CLIENT} ${DLT_LIBRARIES} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} vsomeip_utilities ) @@ -3194,9 +3194,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFERED_SERVICES_INFO_SERVICE ${TEST_OFFERED_SERVICES_INFO_NAME}_service) add_executable(${TEST_OFFERED_SERVICES_INFO_SERVICE} offered_services_info_test/${TEST_OFFERED_SERVICES_INFO_NAME}_service.cpp) target_link_libraries(${TEST_OFFERED_SERVICES_INFO_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3205,9 +3205,9 @@ if(NOT ${TESTS_BAT}) set(TEST_OFFERED_SERVICES_INFO_CLIENT ${TEST_OFFERED_SERVICES_INFO_NAME}_client) add_executable(${TEST_OFFERED_SERVICES_INFO_CLIENT} offered_services_info_test/${TEST_OFFERED_SERVICES_INFO_NAME}_client.cpp) target_link_libraries(${TEST_OFFERED_SERVICES_INFO_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3237,9 +3237,9 @@ if(NOT ${TESTS_BAT}) set(TEST_PENDING_SUBSCRIPTION_SERVICE ${TEST_PENDING_SUBSCRIPTION_NAME}_service) add_executable(${TEST_PENDING_SUBSCRIPTION_SERVICE} pending_subscription_tests/${TEST_PENDING_SUBSCRIPTION_NAME}_service.cpp) target_link_libraries(${TEST_PENDING_SUBSCRIPTION_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3260,11 +3260,11 @@ if(NOT ${TESTS_BAT}) ) target_link_libraries(${TEST_PENDING_SUBSCRIPTION_CLIENT} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-sd + vsomeip3 + vsomeip3-sd ${DLT_LIBRARIES} vsomeip_utilities ) @@ -3301,9 +3301,9 @@ if(NOT ${TESTS_BAT}) set(TEST_MALICIOUS_DATA_SERVICE ${TEST_MALICIOUS_DATA_NAME}_service) add_executable(${TEST_MALICIOUS_DATA_SERVICE} malicious_data_tests/${TEST_MALICIOUS_DATA_NAME}_service.cpp) target_link_libraries(${TEST_MALICIOUS_DATA_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3324,11 +3324,11 @@ if(NOT ${TESTS_BAT}) ) target_link_libraries(${TEST_MALICIOUS_DATA_CLIENT} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-sd + vsomeip3 + vsomeip3-sd ${DLT_LIBRARIES} vsomeip_utilities ) @@ -3368,9 +3368,9 @@ if(NOT ${TESTS_BAT}) add_executable(${TEST_E2E_SERVICE} e2e_tests/${TEST_E2E_SERVICE}.cpp) target_link_libraries(${TEST_E2E_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3380,9 +3380,9 @@ if(NOT ${TESTS_BAT}) e2e_tests/${TEST_E2E_CLIENT}.cpp ) target_link_libraries(${TEST_E2E_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3440,9 +3440,9 @@ if(NOT ${TESTS_BAT} AND ${TEST_E2E_PROFILE_04}) add_executable(${TEST_E2E_PROFILE_04_SERVICE} e2e_tests/${TEST_E2E_PROFILE_04_SERVICE}.cpp) target_link_libraries(${TEST_E2E_PROFILE_04_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3452,9 +3452,9 @@ if(NOT ${TESTS_BAT} AND ${TEST_E2E_PROFILE_04}) e2e_tests/${TEST_E2E_PROFILE_04_CLIENT}.cpp ) target_link_libraries(${TEST_E2E_PROFILE_04_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3512,9 +3512,9 @@ if(NOT ${TESTS_BAT} AND ${TEST_E2E_PROFILE_07}) add_executable(${TEST_E2E_PROFILE_07_SERVICE} e2e_tests/${TEST_E2E_PROFILE_07_SERVICE}.cpp) target_link_libraries(${TEST_E2E_PROFILE_07_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3524,9 +3524,9 @@ if(NOT ${TESTS_BAT} AND ${TEST_E2E_PROFILE_07}) e2e_tests/${TEST_E2E_PROFILE_07_CLIENT}.cpp ) target_link_libraries(${TEST_E2E_PROFILE_07_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3584,9 +3584,9 @@ if(NOT ${TESTS_BAT}) add_executable(${TEST_EVENT_SERVICE} event_tests/${TEST_EVENT_SERVICE}.cpp) target_link_libraries(${TEST_EVENT_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3596,9 +3596,9 @@ if(NOT ${TESTS_BAT}) event_tests/${TEST_EVENT_CLIENT}.cpp ) target_link_libraries(${TEST_EVENT_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3666,9 +3666,9 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") add_executable(${TEST_NPDU_DAEMON_CLIENT} npdu_tests/${TEST_NPDU_DAEMON}.cpp) set_target_properties(${TEST_NPDU_DAEMON_CLIENT} PROPERTIES COMPILE_FLAGS -DRMD_CLIENT_SIDE) target_link_libraries(${TEST_NPDU_DAEMON_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3678,9 +3678,9 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") add_executable(${TEST_NPDU_DAEMON_SERVICE} npdu_tests/${TEST_NPDU_DAEMON}.cpp) set_target_properties(${TEST_NPDU_DAEMON_SERVICE} PROPERTIES COMPILE_FLAGS -DRMD_SERVICE_SIDE) target_link_libraries(${TEST_NPDU_DAEMON_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3694,10 +3694,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") add_executable(${TEST_NPDU_SERVICE_ONE} npdu_tests/${TEST_NPDU_SERVICE}.cpp) set_target_properties(${TEST_NPDU_SERVICE_ONE} PROPERTIES COMPILE_FLAGS -DSERVICE_NUMBER=0) target_link_libraries(${TEST_NPDU_SERVICE_ONE} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3707,10 +3707,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") add_executable(${TEST_NPDU_SERVICE_TWO} npdu_tests/${TEST_NPDU_SERVICE}.cpp) set_target_properties(${TEST_NPDU_SERVICE_TWO} PROPERTIES COMPILE_FLAGS -DSERVICE_NUMBER=1) target_link_libraries(${TEST_NPDU_SERVICE_TWO} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3720,10 +3720,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") add_executable(${TEST_NPDU_SERVICE_THREE} npdu_tests/${TEST_NPDU_SERVICE}.cpp) set_target_properties(${TEST_NPDU_SERVICE_THREE} PROPERTIES COMPILE_FLAGS -DSERVICE_NUMBER=2) target_link_libraries(${TEST_NPDU_SERVICE_THREE} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3733,10 +3733,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") add_executable(${TEST_NPDU_SERVICE_FOUR} npdu_tests/${TEST_NPDU_SERVICE}.cpp) set_target_properties(${TEST_NPDU_SERVICE_FOUR} PROPERTIES COMPILE_FLAGS -DSERVICE_NUMBER=3) target_link_libraries(${TEST_NPDU_SERVICE_FOUR} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3787,10 +3787,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") set(TEST_NPDU_CLIENT_ONE npdu_test_client_1) add_executable(${TEST_NPDU_CLIENT_ONE} npdu_tests/${TEST_NPDU_CLIENT}.cpp) target_link_libraries(${TEST_NPDU_CLIENT_ONE} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3799,10 +3799,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") set(TEST_NPDU_CLIENT_TWO npdu_test_client_2) add_executable(${TEST_NPDU_CLIENT_TWO} npdu_tests/${TEST_NPDU_CLIENT}.cpp) target_link_libraries(${TEST_NPDU_CLIENT_TWO} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3811,10 +3811,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") set(TEST_NPDU_CLIENT_THREE npdu_test_client_3) add_executable(${TEST_NPDU_CLIENT_THREE} npdu_tests/${TEST_NPDU_CLIENT}.cpp) target_link_libraries(${TEST_NPDU_CLIENT_THREE} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3823,10 +3823,10 @@ if(NOT ${TESTS_BAT} AND NOT ${CMAKE_SYSTEM_NAME} MATCHES "QNX") set(TEST_NPDU_CLIENT_FOUR npdu_test_client_4) add_executable(${TEST_NPDU_CLIENT_FOUR} npdu_tests/${TEST_NPDU_CLIENT}.cpp) target_link_libraries(${TEST_NPDU_CLIENT_FOUR} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-cfg - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + vsomeip3-cfg + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3889,9 +3889,9 @@ if(NOT ${TESTS_BAT}) add_executable(${TEST_SOMEIPTP_SERVICE} someip_tp_tests/${TEST_SOMEIPTP_SERVICE}.cpp) target_link_libraries(${TEST_SOMEIPTP_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3915,12 +3915,12 @@ if(NOT ${TESTS_BAT}) ) target_link_libraries(${TEST_SOMEIPTP_CLIENT} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} - ${VSOMEIP_NAME} - ${VSOMEIP_NAME}-sd + vsomeip3 + vsomeip3-sd vsomeip_utilities ) @@ -3962,9 +3962,9 @@ if(NOT ${TESTS_BAT} AND ${TEST_SECOND_ADDRESS}) second_address_tests/${TEST_SECOND_ADDRESS_SERVICE}.cpp ) target_link_libraries(${TEST_SECOND_ADDRESS_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -3974,9 +3974,9 @@ if(NOT ${TESTS_BAT} AND ${TEST_SECOND_ADDRESS}) second_address_tests/${TEST_SECOND_ADDRESS_CLIENT}.cpp ) target_link_libraries(${TEST_SECOND_ADDRESS_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -4058,9 +4058,9 @@ if(NOT ${TESTS_BAT}) suspend_resume_tests/${TEST_SUSPEND_RESUME_SERVICE}.cpp ) target_link_libraries(${TEST_SUSPEND_RESUME_SERVICE} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities @@ -4070,9 +4070,9 @@ if(NOT ${TESTS_BAT}) suspend_resume_tests/${TEST_SUSPEND_RESUME_CLIENT}.cpp ) target_link_libraries(${TEST_SUSPEND_RESUME_CLIENT} - ${VSOMEIP_NAME} - ${Boost_LIBRARIES} - ${DL_LIBRARY} + vsomeip3 + Boost::system + DL_INTERFACE ${TEST_LINK_LIBRARIES} ${DLT_LIBRARIES} vsomeip_utilities diff --git a/test/network_tests/offer_tests/offer_test_client.cpp b/test/network_tests/offer_tests/offer_test_client.cpp index e5697cb2f..d84aed64e 100644 --- a/test/network_tests/offer_tests/offer_test_client.cpp +++ b/test/network_tests/offer_tests/offer_test_client.cpp @@ -21,7 +21,7 @@ #ifdef ANDROID #include "../../implementation/configuration/include/internal_android.hpp" #else -#include "../../implementation/configuration/include/internal.hpp" +#include "internal.hpp" #endif // ANDROID #include "offer_test_globals.hpp" diff --git a/test/network_tests/offered_services_info_test/offered_services_info_test_client.cpp b/test/network_tests/offered_services_info_test/offered_services_info_test_client.cpp index 081da5659..1f5c09d13 100644 --- a/test/network_tests/offered_services_info_test/offered_services_info_test_client.cpp +++ b/test/network_tests/offered_services_info_test/offered_services_info_test_client.cpp @@ -22,7 +22,7 @@ #ifdef ANDROID #include "../../implementation/configuration/include/internal_android.hpp" #else -#include "../../implementation/configuration/include/internal.hpp" +#include "internal.hpp" #endif #include "offered_services_info_test_globals.hpp" diff --git a/test/network_tests/offered_services_info_test/offered_services_info_test_service.cpp b/test/network_tests/offered_services_info_test/offered_services_info_test_service.cpp index d1f9726d7..cd691e2db 100644 --- a/test/network_tests/offered_services_info_test/offered_services_info_test_service.cpp +++ b/test/network_tests/offered_services_info_test/offered_services_info_test_service.cpp @@ -22,7 +22,7 @@ #ifdef ANDROID #include "../../implementation/configuration/include/internal_android.hpp" #else -#include "../../implementation/configuration/include/internal.hpp" +#include "internal.hpp" #endif // ANDROID #include "offered_services_info_test_globals.hpp" diff --git a/test/unit_tests/CMakeLists.txt b/test/unit_tests/CMakeLists.txt index 662867240..bdb0cf096 100644 --- a/test/unit_tests/CMakeLists.txt +++ b/test/unit_tests/CMakeLists.txt @@ -9,9 +9,6 @@ file (GLOB SRCS main.cpp **/*.cpp) set(THREADS_PREFER_PTHREAD_FLAG ON) -find_package(Threads REQUIRED) -find_package(Boost 1.55 COMPONENTS filesystem system REQUIRED) - # ---------------------------------------------------------------------------- # Executable and libraries to link # ---------------------------------------------------------------------------- @@ -21,8 +18,8 @@ target_link_libraries ( vsomeip3 vsomeip3-cfg Threads::Threads - ${Boost_LIBRARIES} - ${DL_LIBRARY} + Boost::system + DL_INTERFACE gtest vsomeip_utilities )