Explorar o código

[fix] 修改了cmake中安装依赖的方式&取消.vscode的上传&取消节点中对spdlog的初始配置

wangep1 hai 8 meses
pai
achega
1a1410ac5e

+ 1 - 0
.gitignore

@@ -0,0 +1 @@
+**/.vscode/**

+ 6 - 3
saturn_controller/CMakeLists.txt

@@ -35,9 +35,12 @@ include_directories(./sdk/include)
 include_directories(./include)
 
 message(COMMAND echo "The current binary directory is: ${CMAKE_CURRENT_BINARY_DIR}")
-file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../install/saturn_controller/lib)
-file(COPY ./sdk/lib/x86_64/libmc_client.so DESTINATION 
-  ${CMAKE_CURRENT_BINARY_DIR}/../../install/saturn_controller/lib/)
+#file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/../../install/saturn_controller/lib)
+#file(COPY ./sdk/lib/x86_64/libmc_client.so DESTINATION 
+#  ${CMAKE_CURRENT_BINARY_DIR}/../../install/saturn_controller/lib/)
+install(DIRECTORY ./sdk/lib/x86_64/
+  DESTINATION lib
+)
 
 link_directories(${CMAKE_CURRENT_BINARY_DIR}/../../install/saturn_controller/lib) 
 

+ 3 - 1
saturn_controller/src/saturn_controller.cpp

@@ -2,6 +2,8 @@
 namespace saturn_ros2 {
 SaturnController::SaturnController(const rclcpp::NodeOptions& options)
     : node_(std::make_shared<rclcpp::Node>("saturn_controller", options)) {
+    
+    /*
     // spdlog config
     spdlog::init_thread_pool(8192, 1);
     // 10M * 3 log files
@@ -21,7 +23,7 @@ SaturnController::SaturnController(const rclcpp::NodeOptions& options)
 
     spdlog::set_default_logger(async_logger);
     spdlog::flush_every(std::chrono::seconds(5));
-    
+    */
 
     SPDLOG_INFO("====== SaturnController created ======");
     config_handler_ = std::make_shared<ConfigHandler>(node_);