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

Workaround for the change in libnddscore.so in connext 5.2.0 between gcc4.6.3 and gcc4.8.2 (#55)

Browse source 
* Workaround for the change in libnddscore.so in connext 5.2.0 between gcc4.6.3 and gcc4.8.2

* Prefix macro variables with underscore
This commit is contained in:
dhood 2016-04-28 15:27:12 -07:00 • committed by William Woodall
parent 11753a3dd3
commit 7aeb957c2c
1 changed files with 18 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

18
rcl/test/CMakeLists.txt
View file

@ -129,6 +129,13 @@ 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
@ -139,4 +146,15 @@ 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()
call_for_each_rmw_implementation(test_target) call_for_each_rmw_implementation(test_target)