Skip to content

Commit

Permalink
Merge branch 'daniel-dsouza-master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dima Garbuzov committed Mar 11, 2020
2 parents aab918f + f56ce82 commit 7b7c881
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 0 deletions.
1 change: 1 addition & 0 deletions ouster_client/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ endif()
add_library(ouster_client STATIC
src/os1.cpp
src/os1_util.cpp)
set_target_properties(ouster_client PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(ouster_client jsoncpp)
target_include_directories(ouster_client PUBLIC include)
target_include_directories(ouster_client SYSTEM PRIVATE ${jsoncpp_INCLUDE_DIRS})
Expand Down
1 change: 1 addition & 0 deletions ouster_ros/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ catkin_package(
)

add_library(ouster_ros STATIC src/os1_ros.cpp)
set_target_properties(ouster_ros PROPERTIES POSITION_INDEPENDENT_CODE ON)
target_link_libraries(ouster_ros ${catkin_LIBRARIES})
add_dependencies(ouster_ros ${PROJECT_NAME}_gencpp)

Expand Down

0 comments on commit 7b7c881

Please sign in to comment.