1
0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-22 11:44:53 +08:00

Fixed ROS building.

This commit is contained in:
William Woodall 2012-01-01 01:32:38 -06:00
parent 8e80673cd8
commit 04608ec94b
2 changed files with 10 additions and 3 deletions

View File

@ -1,11 +1,15 @@
cmake_minimum_required(VERSION 2.4.6)
if(DEFINED $ENV{ROS_ROOT})
set(ROS_ROOT $ENV{ROS_ROOT})
if(DEFINED ROS_ROOT)
# Build with ROS
include(serial_ros.cmake)
message("Building with ROS")
build_serial()
else(DEFINED $ENV{ROS_ROOT})
else(DEFINED ROS_ROOT)
# Build normally
include(serial.cmake)
message("Building stand alone")
build_serial()
endif(DEFINED $ENV{ROS_ROOT})
endif(DEFINED ROS_ROOT)

View File

@ -32,4 +32,7 @@ rosbuild_link_boost(${PROJECT_NAME} system filesystem thread)
# Build example
rosbuild_add_executable(serial_example examples/serial_example.cpp)
target_link_libraries(serial_example ${PROJECT_NAME})
message(here)
endmacro(build_serial)