-
-
Notifications
You must be signed in to change notification settings - Fork 74
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
2 changed files
with
48 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 32a76bb9..68bd38f4 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -5,7 +5,7 @@ find_package(catkin REQUIRED COMPONENTS cpp_common) | ||
find_package(Boost REQUIRED COMPONENTS date_time system thread) | ||
catkin_package( | ||
INCLUDE_DIRS include | ||
- LIBRARIES ${PROJECT_NAME} | ||
+ LIBRARIES ${PROJECT_NAME} ${RT_LIBRARY} | ||
CATKIN_DEPENDS cpp_common | ||
DEPENDS Boost | ||
) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index 3563831..7d139fd 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -32,19 +32,19 @@ include_directories(${LIBRARY_INCLUDE_DIR} ${catkin_INCLUDE_DIRS}) | ||
|
||
## Declare libraries | ||
add_library(liburg_c ${LIBRARY_SRC_DIR}/urg_sensor.c | ||
- ${LIBRARY_SRC_DIR}/urg_utils.c | ||
- ${LIBRARY_SRC_DIR}/urg_debug.c | ||
- ${LIBRARY_SRC_DIR}/urg_connection.c | ||
- ${LIBRARY_SRC_DIR}/urg_ring_buffer.c | ||
- ${LIBRARY_SRC_DIR}/urg_serial.c | ||
- ${LIBRARY_SRC_DIR}/urg_serial_utils.c | ||
- ${LIBRARY_SRC_DIR}/urg_tcpclient.c | ||
- ${LIBRARY_SRC_DIR}/urg_time.c | ||
- | ||
+ ${LIBRARY_SRC_DIR}/urg_utils.c | ||
+ ${LIBRARY_SRC_DIR}/urg_debug.c | ||
+ ${LIBRARY_SRC_DIR}/urg_connection.c | ||
+ ${LIBRARY_SRC_DIR}/urg_ring_buffer.c | ||
+ ${LIBRARY_SRC_DIR}/urg_serial.c | ||
+ ${LIBRARY_SRC_DIR}/urg_serial_utils.c | ||
+ ${LIBRARY_SRC_DIR}/urg_tcpclient.c | ||
+ ${LIBRARY_SRC_DIR}/urg_time.c | ||
) | ||
-if(NOT ANDROID) | ||
+ | ||
+if(NOT ANDROID AND NOT APPLE) | ||
target_link_libraries(liburg_c -lrt -lm) | ||
-endif(NOT ANDROID) | ||
+endif(NOT ANDROID AND NOT APPLE) | ||
|
||
add_library(open_urg_sensor ${LIBRARY_SAMPLE_DIR}/open_urg_sensor.c) | ||
target_link_libraries(open_urg_sensor -lm liburg_c ${catkin_LIBRARIES}) |