niklas/rcl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove unused CMake code (#475)

Browse source 
* remove copy-n-paste CMake code

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>

* fixup rmw_implementation_cmake dependency

Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
This commit is contained in:
Mikael Arguedas 2019-07-29 20:16:36 +02:00 • committed by Dirk Thomas
parent 5fde9c0c0e
commit 926da81913
2 changed files with 1 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

17
rcl_action/CMakeLists.txt
View file

@ -9,7 +9,6 @@ find_package(action_msgs REQUIRED)
find_package(rcl REQUIRED) find_package(rcl REQUIRED)
find_package(rcutils REQUIRED) find_package(rcutils REQUIRED)
find_package(rmw REQUIRED) find_package(rmw REQUIRED)
find_package(rmw_implementation_cmake REQUIRED)
include_directories( include_directories(
include include
@ -110,12 +109,9 @@ if(BUILD_TESTING)
ament_add_gtest( ament_add_gtest(
"${target}${target_suffix}" ${ARGN} "${target}${target_suffix}" ${ARGN}
TIMEOUT 60 TIMEOUT 60
APPEND_LIBRARY_DIRS "${append_library_dirs}"
ENV ENV
RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation} RCL_ASSERT_RMW_ID_MATCHES=${rmw_implementation}
RMW_IMPLEMENTATION=${rmw_implementation} RMW_IMPLEMENTATION=${rmw_implementation}
ROS_SECURITY_ROOT_DIRECTORY="${VALID_ROS_SECURITY_ROOT_DIRECTORY}"
PATH="${TEST_PATH}"
) )
if(TARGET ${target}${target_suffix}) if(TARGET ${target}${target_suffix})
target_compile_definitions(${target}${target_suffix} target_compile_definitions(${target}${target_suffix}
@ -135,19 +131,6 @@ if(BUILD_TESTING)
endfunction() endfunction()
macro(targets) macro(targets)
set(ENV_PATH "$ENV{PATH}")
file(TO_CMAKE_PATH "${ENV_PATH}" ENV_PATH)
set(TEST_PATH "${ENV_PATH}")
if(rmw_implementation STREQUAL "rmw_connext_cpp")
if(UNIX AND NOT APPLE)
set(RTI_BIN_PATH "$ENV{RTI_OPENSSL_BIN}")
file(TO_CMAKE_PATH "${RTI_BIN_PATH}" RTI_BIN_PATH)
set(TEST_PATH "${RTI_BIN_PATH};${ENV_PATH}")
if(NOT WIN32)
string(REPLACE ";" ":" TEST_PATH "${TEST_PATH}")
endif()
endif()
endif()
custom_test_c(test_action_communication custom_test_c(test_action_communication
"test/rcl_action/test_action_communication.cpp") "test/rcl_action/test_action_communication.cpp")
custom_test_c(test_action_interaction custom_test_c(test_action_interaction

1
rcl_action/package.xml
View file

@ -25,6 +25,7 @@
<test_depend>ament_lint_common</test_depend> <test_depend>ament_lint_common</test_depend>
<test_depend>ament_lint_auto</test_depend> <test_depend>ament_lint_auto</test_depend>
<test_depend>osrf_testing_tools_cpp</test_depend> <test_depend>osrf_testing_tools_cpp</test_depend>
<test_depend>rmw_implementation_cmake</test_depend>
<test_depend>test_msgs</test_depend> <test_depend>test_msgs</test_depend>
<export> <export>