Using ament_target_dependencies where possible (#400)
* Using ament_target_dependencies where possible Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com> * Modified rcl_add_custom_* to use AMENT_DEPENDENCIES where possible Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com> * Added again osrf_testing_tools_cpp::memory_tools library where needed. Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com> * Modified with PR comment, and replaced forgotten osrf_testing_tools_cpp including Signed-off-by: ivanpauno <ivanpauno@ekumenlabs.com>
This commit is contained in:
ivanpauno
GitHub
parent
29b0838388
commit
99630cb66d
3 changed files with 38 additions and 55 deletions
|
|
@ -35,11 +35,10 @@ function(test_target_function)
|
|||
|
||||
rcl_add_custom_gtest(test_client${target_suffix}
|
||||
SRCS rcl/test_client.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_time${target_suffix}
|
||||
|
|
@ -71,11 +70,10 @@ function(test_target_function)
|
|||
|
||||
rcl_add_custom_gtest(test_get_node_names${target_suffix}
|
||||
SRCS rcl/test_get_node_names.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_lexer${target_suffix}
|
||||
|
|
@ -88,11 +86,10 @@ function(test_target_function)
|
|||
|
||||
rcl_add_custom_gtest(test_lexer_lookahead${target_suffix}
|
||||
SRCS rcl/test_lexer_lookahead.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
set(AMENT_GTEST_ARGS "")
|
||||
|
|
@ -107,21 +104,19 @@ function(test_target_function)
|
|||
endif()
|
||||
rcl_add_custom_gtest(test_graph${target_suffix}
|
||||
SRCS rcl/test_graph.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
${AMENT_GTEST_ARGS}
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_count_matched${target_suffix}
|
||||
SRCS rcl/test_count_matched.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_init${target_suffix}
|
||||
|
|
@ -134,11 +129,10 @@ function(test_target_function)
|
|||
|
||||
rcl_add_custom_gtest(test_node${target_suffix}
|
||||
SRCS rcl/test_node.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var} ${memory_tools_ld_preload_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME} osrf_testing_tools_cpp::memory_tools
|
||||
AMENT_DEPENDENCIES ${rmw_implementation}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_arguments${target_suffix}
|
||||
|
|
@ -150,90 +144,81 @@ function(test_target_function)
|
|||
|
||||
rcl_add_custom_gtest(test_remap${target_suffix}
|
||||
SRCS rcl/test_remap.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_remap_integration${target_suffix}
|
||||
SRCS rcl/test_remap_integration.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
TIMEOUT 200
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES "test_msgs"
|
||||
AMENT_DEPENDENCIES "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_guard_condition${target_suffix}
|
||||
SRCS rcl/test_guard_condition.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var} ${memory_tools_ld_preload_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME} osrf_testing_tools_cpp::memory_tools
|
||||
AMENT_DEPENDENCIES ${rmw_implementation}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_publisher${target_suffix}
|
||||
SRCS rcl/test_publisher.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_service${target_suffix}
|
||||
SRCS rcl/test_service.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_subscription${target_suffix}
|
||||
SRCS rcl/test_subscription.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_wait${target_suffix}
|
||||
SRCS rcl/test_wait.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_namespace${target_suffix}
|
||||
SRCS test_namespace.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
ENV ${rmw_implementation_env_var}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
# Launch tests
|
||||
|
||||
rcl_add_custom_executable(service_fixture${target_suffix}
|
||||
SRCS rcl/service_fixture.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_executable(client_fixture${target_suffix}
|
||||
SRCS rcl/client_fixture.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "test_msgs"
|
||||
AMENT_DEPENDENCIES ${rmw_implementation} "osrf_testing_tools_cpp" "test_msgs"
|
||||
)
|
||||
|
||||
rcl_add_custom_launch_test(test_services
|
||||
|
|
@ -296,9 +281,9 @@ rcl_add_custom_gtest(test_expand_topic_name
|
|||
|
||||
rcl_add_custom_gtest(test_timer${target_suffix}
|
||||
SRCS rcl/test_timer.cpp
|
||||
INCLUDE_DIRS ${osrf_testing_tools_cpp_INCLUDE_DIRS}
|
||||
APPEND_LIBRARY_DIRS ${extra_lib_dirs}
|
||||
LIBRARIES ${PROJECT_NAME}
|
||||
AMENT_DEPENDENCIES "osrf_testing_tools_cpp"
|
||||
)
|
||||
|
||||
rcl_add_custom_gtest(test_security_directory
|
||||
|
|
@ -309,4 +294,4 @@ rcl_add_custom_gtest(test_security_directory
|
|||
|
||||
# Install test resources
|
||||
install(DIRECTORY ${test_resources_dir_name}
|
||||
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
DESTINATION ${CMAKE_CURRENT_BINARY_DIR})
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue