mirror of
https://github.com/wjwwood/serial.git
synced 2026-01-22 19:54:57 +08:00
Merge branch 'master' of github.com:wjwwood/serial into serial_listener
This commit is contained in:
commit
ba1b763d43
@ -2,14 +2,16 @@ cmake_minimum_required(VERSION 2.4.6)
|
||||
|
||||
set(ROS_ROOT $ENV{ROS_ROOT})
|
||||
|
||||
if(DEFINED ROS_ROOT)
|
||||
option(SERIAL_BUILD_WIHOUT_ROS "Build without ROS?" OFF)
|
||||
|
||||
if(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)
|
||||
# Build with ROS
|
||||
include(serial_ros.cmake)
|
||||
message("Building with ROS")
|
||||
build_serial()
|
||||
else(DEFINED ROS_ROOT)
|
||||
else(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)
|
||||
# Build normally
|
||||
include(serial.cmake)
|
||||
message("Building stand alone")
|
||||
build_serial()
|
||||
endif(DEFINED ROS_ROOT)
|
||||
endif(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)
|
||||
Loading…
x
Reference in New Issue
Block a user