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

Merge pull request #227 from ros2/cmake35

Browse source 
require CMake 3.5
This commit is contained in:
Dirk Thomas 2016-06-16 12:18:59 -07:00 • committed by GitHub
commit 759b063db5
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
rclcpp/CMakeLists.txt
View file

@ -1,4 +1,4 @@
cmake_minimum_required(VERSION 2.8.3)
cmake_minimum_required(VERSION 3.5)
project(rclcpp)
@ -43,7 +43,7 @@ set(${PROJECT_NAME}_SRCS
)
macro(target)
if(NOT "${target_suffix} " STREQUAL " ")
if(NOT target_suffix STREQUAL "")
get_rcl_information("${rmw_implementation}" "rcl${target_suffix}")
endif()
add_library(${PROJECT_NAME}${target_suffix} SHARED

2
rclcpp/cmake/get_rclcpp_information.cmake
View file

@ -29,7 +29,7 @@ macro(get_rclcpp_information rmw_implementation var_prefix)
set(${var_prefix}_FOUND TRUE)
# Get rcl using the existing macro
if(NOT "${target_suffix} " STREQUAL " ")
if(NOT target_suffix STREQUAL "")
get_rcl_information("${rmw_implementation}" "rcl${target_suffix}")
endif()