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

Revert "Merge branch 'ament_cmake'"

Browse Source 
This reverts commit 8e0effcd36b855701d9327aecff949d7f2b20e31.
This commit is contained in:
Dan Rose 2020-09-03 19:45:41 -05:00
parent 2df800d0fc
commit ae46504ae7
No known key found for this signature in database
GPG Key ID: 75E06FF4E527321C
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@ -33,7 +33,7 @@ elseif(WIN32) # Windows
src/impl/win.cc src/impl/win.cc
src/impl/list_ports/list_ports_win.cc src/impl/list_ports/list_ports_win.cc
) )
target_link_libraries(${PROJECT_NAME} setupapi) target_link_libraries(${PROJECT_NAME} setupapi)
ament_export_libraries(setupapi) ament_export_libraries(setupapi)
endif() endif()
@ -54,17 +54,13 @@ install(TARGETS ${PROJECT_NAME}
) )
## Install headers ## Install headers
install( install(FILES include/serial/serial.h include/serial/v8stdint.h
FILES include/serial/serial.h include/serial/v8stdint.h DESTINATION include/serial
DESTINATION include/serial
) )
## Tests ## Tests
if(BUILD_TESTING) #if(BUILD_TESTING)
add_subdirectory(tests) # add_subdirectory(tests)
endif() #endif()
ament_export_include_directories(include)
ament_export_libraries(${PROJECT_NAME})
ament_package() ament_package()

4
package.xml
View File

@ -21,10 +21,10 @@
<buildtool_depend>ament_cmake</buildtool_depend> <buildtool_depend>ament_cmake</buildtool_depend>
<test_depend>ament_cmake_gtest</test_depend>
<test_depend>boost</test_depend> <test_depend>boost</test_depend>
<export> <export>
<build_type>ament_cmake</build_type> <build_type>ament_cmake</build_type>
</export> </export>
</package> </package>

7
tests/CMakeLists.txt
View File

@ -1,15 +1,12 @@
if(UNIX) if(UNIX)
find_package(ament_cmake_gtest REQUIRED) catkin_add_gtest(${PROJECT_NAME}-test unix_serial_tests.cc)
find_package(Boost REQUIRED)
ament_add_gtest(${PROJECT_NAME}-test unix_serial_tests.cc)
target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME} ${Boost_LIBRARIES}) target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME} ${Boost_LIBRARIES})
if(NOT APPLE) if(NOT APPLE)
target_link_libraries(${PROJECT_NAME}-test util) target_link_libraries(${PROJECT_NAME}-test util)
endif() endif()
if(NOT APPLE) # these tests are unreliable on macOS if(NOT APPLE) # these tests are unreliable on macOS
ament_add_gtest(${PROJECT_NAME}-test-timer unit/unix_timer_tests.cc) catkin_add_gtest(${PROJECT_NAME}-test-timer unit/unix_timer_tests.cc)
target_link_libraries(${PROJECT_NAME}-test-timer ${PROJECT_NAME}) target_link_libraries(${PROJECT_NAME}-test-timer ${PROJECT_NAME})
endif() endif()
endif() endif()