Merge branch 'master' of https://github.com/unitreerobotics/z1_controller

# Conflicts: # .gitignore # lib/libZ1_ROS_x86_64.so # lib/libZ1_UDP_x86_64.so
2023-05-09 15:33:50 -04:00 · 2023-05-09 15:33:50 -04:00 · c4c093fb0f
parent f0d89807bd fd5a63f09e
commit c4c093fb0f
6 changed files with 2 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,3 +2,4 @@
 /build
 /cmake-build*
 .idea
+build
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -65,4 +65,4 @@ link_directories(lib)
 # ----------------------add executable----------------------
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR})
 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} )
--- a/lib/libZ1_ROS_Linux64.so
+++ b/lib/libZ1_ROS_Linux64.so
--- a/lib/libZ1_ROS_x86_64.so
+++ b/lib/libZ1_ROS_x86_64.so
--- a/lib/libZ1_UDP_aarch64.so
+++ b/lib/libZ1_UDP_aarch64.so
--- a/lib/libZ1_UDP_Linux64.so
+++ b/lib/libZ1_UDP_Linux64.so