From 9f5fb0fb5e4e1000e166360666a8a4b66ddc6d44 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Wed, 15 Jun 2016 11:35:56 -0700 Subject: [PATCH 1/2] require CMake 3.5 --- rcl/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rcl/CMakeLists.txt b/rcl/CMakeLists.txt index 5a0ec15..f686c55 100644 --- a/rcl/CMakeLists.txt +++ b/rcl/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.3) +cmake_minimum_required(VERSION 3.5) project(rcl) From 35add7f8cca17413f0e557dd02e356191aa2b654 Mon Sep 17 00:00:00 2001 From: Dirk Thomas Date: Thu, 16 Jun 2016 09:19:20 -0700 Subject: [PATCH 2/2] remove trailing spaces from comparisons, obsolete quotes and explicit variable expansion --- rcl/test/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/rcl/test/CMakeLists.txt b/rcl/test/CMakeLists.txt index a3aeab8..6d4ac89 100644 --- a/rcl/test/CMakeLists.txt +++ b/rcl/test/CMakeLists.txt @@ -23,7 +23,7 @@ endmacro() function(test_target_function) # TODO(wjwwood): remove these when C type support is supported by typesupport_introspection. # 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}'") return() endif() @@ -68,7 +68,7 @@ function(test_target_function) ) # 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} SRCS rcl/test_graph.cpp ENV ${extra_test_env} @@ -144,7 +144,7 @@ function(test_target_function) # 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 ") + if(rmw_implementation STREQUAL "rmw_connext_cpp") connext_workaround(client_fixture${target_suffix}) connext_workaround(service_fixture${target_suffix}) endif() @@ -159,7 +159,7 @@ function(test_target_function) endfunction() 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) set(_link_flags "-Wl,--no-as-needed") if(_current_link_flags)