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

Fix up linking on Linux for the tests

Browse Source 
Conflicts:
	CMakeLists.txt
	tests/serial_tests.cc
This commit is contained in:
William Woodall 2013-07-31 16:47:19 -07:00
parent e1138fda9e
commit 3292f2b682
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -58,5 +58,10 @@ install(FILES include/serial/serial.h include/serial/v8stdint.h
DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}/serial)
## Tests
catkin_add_gtest(${PROJECT_NAME}-test tests/serial_tests.cc)
target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
if(CATKIN_ENABLE_TESTING)
catkin_add_gtest(${PROJECT_NAME}-test tests/serial_tests.cc)
target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME} ${Boost_LIBRARIES})
if(UNIX AND NOT APPLE)
target_link_libraries(${PROJECT_NAME}-test util)
endif()
endif()

2
tests/serial_tests.cc
View File

@ -29,7 +29,7 @@ void loop()
#include "serial/serial.h"
#ifdef __linux__
#if defined(__linux__)
#include <pty.h>
#else
#include <util.h>