From d1f2eab2801bbd248efb9ece45b44114cb5bfb7c Mon Sep 17 00:00:00 2001 From: ivanpauno Date: Mon, 18 Mar 2019 15:15:45 -0300 Subject: [PATCH] Modified with PR comment, and replaced forgotten osrf_testing_tools_cpp including Signed-off-by: ivanpauno --- rcl/test/CMakeLists.txt | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/rcl/test/CMakeLists.txt b/rcl/test/CMakeLists.txt index 2c65b16e2..cd4e77fc5 100644 --- a/rcl/test/CMakeLists.txt +++ b/rcl/test/CMakeLists.txt @@ -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 "") @@ -127,7 +124,7 @@ function(test_target_function) 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} "osrf_testing_tools_cpp" + AMENT_DEPENDENCIES ${rmw_implementation} ) rcl_add_custom_gtest(test_node${target_suffix}