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

Merge pull request #64 from ros2/cmake35

Browse source 
require CMake 3.5
This commit is contained in:
Dirk Thomas 2016-06-16 12:20:21 -07:00 • committed by GitHub
commit 8cd81a5a9a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
rcl/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3) cmake_minimum_required(VERSION 3.5)
project(rcl) project(rcl)

8
rcl/test/CMakeLists.txt
View file

@ -23,7 +23,7 @@ endmacro()
function(test_target_function) function(test_target_function)
# TODO(wjwwood): remove these when C type support is supported by typesupport_introspection. # TODO(wjwwood): remove these when C type support is supported by typesupport_introspection.
# after removing, we can also recombine the function and macro # after removing, we can also recombine the function and macro
if("${rmw_implementation} " STREQUAL "rmw_fastrtps_cpp ") if(rmw_implementation STREQUAL "rmw_fastrtps_cpp")
message(STATUS "Skipping tests for '${rmw_implementation}'") message(STATUS "Skipping tests for '${rmw_implementation}'")
return() return()
endif() endif()
@ -68,7 +68,7 @@ function(test_target_function)
) )
# TODO(wjwwood): remove this when the graph API works properly for more than OpenSplice. # TODO(wjwwood): remove this when the graph API works properly for more than OpenSplice.
if("${rmw_implementation} " STREQUAL "rmw_opensplice_cpp ") if(rmw_implementation STREQUAL "rmw_opensplice_cpp")
rcl_add_custom_gtest(test_graph${target_suffix} rcl_add_custom_gtest(test_graph${target_suffix}
SRCS rcl/test_graph.cpp SRCS rcl/test_graph.cpp
ENV ${extra_test_env} ENV ${extra_test_env}
@ -144,7 +144,7 @@ function(test_target_function)
# TODO remove this once connext declares libdl dependency in libnddscore again # TODO remove this once connext declares libdl dependency in libnddscore again
# See https://github.com/ros2/rcl/issues/52 # See https://github.com/ros2/rcl/issues/52
if("${rmw_implementation} " STREQUAL "rmw_connext_cpp ") if(rmw_implementation STREQUAL "rmw_connext_cpp")
connext_workaround(client_fixture${target_suffix}) connext_workaround(client_fixture${target_suffix})
connext_workaround(service_fixture${target_suffix}) connext_workaround(service_fixture${target_suffix})
endif() endif()
@ -159,7 +159,7 @@ function(test_target_function)
endfunction() endfunction()
macro(connext_workaround target) macro(connext_workaround target)
if("${CMAKE_CXX_COMPILER_ID} " STREQUAL "GNU ") if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
get_target_property(_current_link_flags ${target} LINK_FLAGS) get_target_property(_current_link_flags ${target} LINK_FLAGS)
set(_link_flags "-Wl,--no-as-needed") set(_link_flags "-Wl,--no-as-needed")
if(_current_link_flags) if(_current_link_flags)