mirror of
https://github.com/wjwwood/serial.git
synced 2026-01-22 19:54:57 +08:00
Removed catkin
This commit is contained in:
parent
69e0372cf0
commit
abcb0c631a
@ -1,8 +1,7 @@
|
|||||||
cmake_minimum_required(VERSION 2.8.3)
|
cmake_minimum_required(VERSION 2.8.3)
|
||||||
project(serial)
|
set(CMAKE_POSITION_INDEPENDENT_CODE ON)
|
||||||
|
|
||||||
# Find catkin
|
project(serial)
|
||||||
find_package(catkin REQUIRED)
|
|
||||||
|
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
find_library(IOKIT_LIBRARY IOKit)
|
find_library(IOKIT_LIBRARY IOKit)
|
||||||
@ -13,11 +12,11 @@ if(UNIX AND NOT APPLE)
|
|||||||
# If Linux, add rt and pthread
|
# If Linux, add rt and pthread
|
||||||
set(rt_LIBRARIES rt)
|
set(rt_LIBRARIES rt)
|
||||||
set(pthread_LIBRARIES pthread)
|
set(pthread_LIBRARIES pthread)
|
||||||
catkin_package(
|
# catkin_package(
|
||||||
LIBRARIES ${PROJECT_NAME}
|
# LIBRARIES ${PROJECT_NAME}
|
||||||
INCLUDE_DIRS include
|
# INCLUDE_DIRS include
|
||||||
DEPENDS rt pthread
|
# DEPENDS rt pthread
|
||||||
)
|
# )
|
||||||
else()
|
else()
|
||||||
# Otherwise normal call
|
# Otherwise normal call
|
||||||
catkin_package(
|
catkin_package(
|
||||||
@ -47,7 +46,7 @@ else()
|
|||||||
endif()
|
endif()
|
||||||
|
|
||||||
## Add serial library
|
## Add serial library
|
||||||
add_library(${PROJECT_NAME} ${serial_SRCS})
|
add_library(${PROJECT_NAME} SHARED ${serial_SRCS})
|
||||||
if(APPLE)
|
if(APPLE)
|
||||||
target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
|
target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY})
|
||||||
elseif(UNIX)
|
elseif(UNIX)
|
||||||
@ -73,7 +72,7 @@ install(TARGETS ${PROJECT_NAME}
|
|||||||
|
|
||||||
## Install headers
|
## Install headers
|
||||||
install(FILES include/serial/serial.h include/serial/v8stdint.h
|
install(FILES include/serial/serial.h include/serial/v8stdint.h
|
||||||
DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}/serial)
|
DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/serial)
|
||||||
|
|
||||||
## Tests
|
## Tests
|
||||||
if(CATKIN_ENABLE_TESTING)
|
if(CATKIN_ENABLE_TESTING)
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user