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

Fixing compile and link problems in Linux and ROS

Browse Source
This commit is contained in:
William Woodall 2012-06-13 20:13:57 -05:00
parent 2ae490b3ac
commit 7e50dc7da6
3 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CMakeLists.txt
View File

@ -2,7 +2,11 @@ cmake_minimum_required(VERSION 2.4.6)
set(ROS_ROOT $ENV{ROS_ROOT})
option(SERIAL_BUILD_WIHOUT_ROS "Build without ROS?" ON)
if(DEFINED ROS_ROOT)
option(SERIAL_BUILD_WIHOUT_ROS "Build without ROS?" OFF)
else(DEFINED ROS_ROOT)
option(SERIAL_BUILD_WIHOUT_ROS "Build without ROS?" ON)
endif(DEFINED ROS_ROOT)
if(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)
# Build with ROS
@ -14,4 +18,4 @@ else(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)
include(serial.cmake)
message("Building stand alone")
build_serial()
endif(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)
endif(DEFINED ROS_ROOT AND NOT SERIAL_BUILD_WIHOUT_ROS)

3
manifest.xml
View File

@ -10,7 +10,8 @@
<url>http://ros.org/wiki/serial</url>
<export>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lserial"/>
<cpp cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lserial -lrt -pthread"/>
<cpp os="osx" cflags="-I${prefix}/include" lflags="-L${prefix}/lib -Wl,-rpath,${prefix}/lib -lserial"/>
</export>
</package>

8
serial_ros.cmake
View File

@ -31,9 +31,15 @@ macro(build_serial)
# Build the serial library
rosbuild_add_library(${PROJECT_NAME} ${SERIAL_SRCS})
# Collect Link Libraries
set(SERIAL_LINK_LIBS ${PROJECT_NAME})
if(UNIX AND NOT APPLE)
list(APPEND SERIAL_LINK_LIBS rt pthread)
endif(UNIX AND NOT APPLE)
# Build example
rosbuild_add_executable(serial_example examples/serial_example.cc)
target_link_libraries(serial_example ${PROJECT_NAME})
target_link_libraries(serial_example ${SERIAL_LINK_LIBS})
# Create unit tests
rosbuild_add_gtest(serial_tests tests/serial_tests.cc)