Myth/serial
1
0
Fork 0
mirror of https://github.com/wjwwood/serial.git synced 2026-01-22 19:54:57 +08:00
Code Issues Projects Releases Wiki Activity

Fixed ROS building.

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

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

3
serial_ros.cmake
View File

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