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

remove now obsolete connext workaround (#203)

Browse source
This commit is contained in:
Mikael Arguedas 2017-12-15 12:16:22 +01:00 • committed by GitHub
parent 261a46772f
commit 1612845d36
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rcl/test/CMakeLists.txt
View file

@ -162,13 +162,6 @@ function(test_target_function)
AMENT_DEPENDENCIES ${rmw_implementation} "example_interfaces" AMENT_DEPENDENCIES ${rmw_implementation} "example_interfaces"
) )
# TODO remove this once connext declares libdl dependency in libnddscore again
# See https://github.com/ros2/rcl/issues/52
if(rmw_implementation STREQUAL "rmw_connext_cpp")
connext_workaround(client_fixture${target_suffix})
connext_workaround(service_fixture${target_suffix})
endif()
rcl_add_custom_launch_test(test_services rcl_add_custom_launch_test(test_services
service_fixture service_fixture
client_fixture client_fixture
@ -208,17 +201,6 @@ function(test_target_function)
endfunction() endfunction()
macro(connext_workaround target)
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
get_target_property(_current_link_flags ${target} LINK_FLAGS)
set(_link_flags "-Wl,--no-as-needed")
if(_current_link_flags)
set(_link_flags ${_current_link_flags} ${_link_flags})
endif()
set_target_properties(${target} PROPERTIES LINK_FLAGS "${_link_flags}")
endif()
endmacro()
# Build simple executable for using in the test_rmw_impl_id_check # Build simple executable for using in the test_rmw_impl_id_check
add_executable(test_rmw_impl_id_check_exe add_executable(test_rmw_impl_id_check_exe
rcl/test_rmw_impl_id_check_exe.cpp) rcl/test_rmw_impl_id_check_exe.cpp)