diff --git a/CMakeLists.txt b/CMakeLists.txt index 4927020..69343a0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,8 +1,7 @@ cmake_minimum_required(VERSION 2.8.3) -project(serial) +set(CMAKE_POSITION_INDEPENDENT_CODE ON) -# Find catkin -find_package(catkin REQUIRED) +project(serial) if(APPLE) find_library(IOKIT_LIBRARY IOKit) @@ -13,11 +12,11 @@ if(UNIX AND NOT APPLE) # If Linux, add rt and pthread set(rt_LIBRARIES rt) set(pthread_LIBRARIES pthread) - catkin_package( - LIBRARIES ${PROJECT_NAME} - INCLUDE_DIRS include - DEPENDS rt pthread - ) + # catkin_package( + # LIBRARIES ${PROJECT_NAME} + # INCLUDE_DIRS include + # DEPENDS rt pthread + # ) else() # Otherwise normal call catkin_package( @@ -47,7 +46,7 @@ else() endif() ## Add serial library -add_library(${PROJECT_NAME} ${serial_SRCS}) +add_library(${PROJECT_NAME} SHARED ${serial_SRCS}) if(APPLE) target_link_libraries(${PROJECT_NAME} ${FOUNDATION_LIBRARY} ${IOKIT_LIBRARY}) elseif(UNIX) @@ -73,7 +72,7 @@ install(TARGETS ${PROJECT_NAME} ## Install headers install(FILES include/serial/serial.h include/serial/v8stdint.h - DESTINATION ${CATKIN_GLOBAL_INCLUDE_DESTINATION}/serial) + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/serial) ## Tests if(CATKIN_ENABLE_TESTING)