Skip to content

Commit

Permalink
Merge pull request ros2#64 from ros2/cmake35
Browse files Browse the repository at this point in the history
require CMake 3.5
  • Loading branch information
dirk-thomas authored Jun 16, 2016
2 parents 10c14e0 + 35add7f commit 8cd81a5
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion rcl/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.5)

project(rcl)

Expand Down
8 changes: 4 additions & 4 deletions rcl/test/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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()
Expand All @@ -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)
Expand Down

0 comments on commit 8cd81a5

Please sign in to comment.