Merge branch 'master' of https://github.com/unitreerobotics/z1_controller
# Conflicts: # .gitignore # lib/libZ1_ROS_x86_64.so # lib/libZ1_UDP_x86_64.so
This commit is contained in:
commit
c4c093fb0f
|
@ -2,3 +2,4 @@
|
||||||
/build
|
/build
|
||||||
/cmake-build*
|
/cmake-build*
|
||||||
.idea
|
.idea
|
||||||
|
build
|
||||||
|
|
|
@ -65,4 +65,4 @@ link_directories(lib)
|
||||||
# ----------------------add executable----------------------
|
# ----------------------add executable----------------------
|
||||||
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
|
||||||
add_executable(z1_ctrl main.cpp)
|
add_executable(z1_ctrl main.cpp)
|
||||||
target_link_libraries(z1_ctrl libZ1_${COMMUNICATION}_Linux64.so ${catkin_LIBRARIES} )
|
target_link_libraries(z1_ctrl libZ1_${COMMUNICATION}_${CMAKE_HOST_SYSTEM_PROCESSOR}.so ${catkin_LIBRARIES} )
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue