Skip to content

Do not mix tabs with spaces + fix build on osx #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Tobias-Fischer wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Do not mix tabs with spaces + fix build on osx #14

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec237f1
Do not mix tabs with spaces
Tobias-Fischer Oct 4, 2020
6eef6bb
Fix build on OSX
Tobias-Fischer Oct 4, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,19 +32,18 @@ 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)
target_link_libraries(liburg_c -lrt -lm)
endif(NOT ANDROID)
if(NOT ANDROID AND NOT APPLE)
target_link_libraries(liburg_c -lrt -lm)
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})
Expand Down Expand Up @@ -90,7 +89,7 @@ target_link_libraries(timeout_test liburg_c open_urg_sensor ${catkin_LIBRARIES})
## Mark executables and/or libraries for installation
install(TARGETS liburg_c open_urg_sensor angle_convert_test calculate_xy find_port
get_distance get_distance_intensity get_multiecho get_multiecho_intensity
reboot_test sensor_parameter sync_time_stamp timeout_test
reboot_test sensor_parameter sync_time_stamp timeout_test
ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
Expand Down