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

Merge branch 'master' into master

Browse Source
This commit is contained in:
Bobo 2020-03-13 09:58:26 +01:00 committed by GitHub
commit 34a4475398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -106,6 +106,7 @@ if(USE_CATKIN)
install(TARGETS ${PROJECT_NAME} install(TARGETS ${PROJECT_NAME}
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
) )
else() else()
set(EXPORT_TARGET_NAME serialTargets) set(EXPORT_TARGET_NAME serialTargets)
@ -146,7 +147,6 @@ else()
endif() endif()
## Tests ## Tests
if(CATKIN_ENABLE_TESTING) if(CATKIN_ENABLE_TESTING)
add_subdirectory(tests) add_subdirectory(tests)