mirror of
https://github.com/wjwwood/serial.git
synced 2026-01-23 04:04:54 +08:00
Removed rt linking on OS X. Fixes #24.
This commit is contained in:
parent
c37d25a43c
commit
fe00053372
@ -11,13 +11,13 @@ if(UNIX AND NOT APPLE)
|
|||||||
INCLUDE_DIRS include
|
INCLUDE_DIRS include
|
||||||
DEPENDS rt pthread
|
DEPENDS rt pthread
|
||||||
)
|
)
|
||||||
else ()
|
else()
|
||||||
# Otherwise normal call
|
# Otherwise normal call
|
||||||
catkin_package(
|
catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME}
|
LIBRARIES ${PROJECT_NAME}
|
||||||
INCLUDE_DIRS include
|
INCLUDE_DIRS include
|
||||||
)
|
)
|
||||||
endif ()
|
endif()
|
||||||
|
|
||||||
## Sources
|
## Sources
|
||||||
set(serial_SRCS
|
set(serial_SRCS
|
||||||
@ -25,7 +25,7 @@ set(serial_SRCS
|
|||||||
# include/serial/serial.h
|
# include/serial/serial.h
|
||||||
# include/serial/v8stdint.h
|
# include/serial/v8stdint.h
|
||||||
)
|
)
|
||||||
if (UNIX)
|
if(UNIX)
|
||||||
# If unix
|
# If unix
|
||||||
list (APPEND serial_SRCS src/impl/unix.cc)
|
list (APPEND serial_SRCS src/impl/unix.cc)
|
||||||
else()
|
else()
|
||||||
@ -34,10 +34,8 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
## Add serial library
|
## Add serial library
|
||||||
add_library(${PROJECT_NAME}
|
add_library(${PROJECT_NAME} ${serial_SRCS})
|
||||||
${serial_SRCS}
|
if(UNIX AND NOT APPLE)
|
||||||
)
|
|
||||||
if (UNIX)
|
|
||||||
target_link_libraries(${PROJECT_NAME} rt)
|
target_link_libraries(${PROJECT_NAME} rt)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user