Fix for behavior_tree library name

Signed-off-by: Ettore Landini <ettore.landini@iit.it>
hsp-iit · Dec 17, 2024 · e7fed36 · e7fed36
1 parent cbc7bfb
commit e7fed36
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,7 @@ if(${BTState})
 	# BehaviorTree.CPP links Boost::coroutine, but does not look for it
 	find_package(Boost COMPONENTS coroutine REQUIRED)
 	find_package(ament_index_cpp)
-	find_package(behaviortree_cpp_v3 REQUIRED)
+	find_package(behaviortree_cpp REQUIRED)
 endif()
 find_package(YCM REQUIRED)
 

diff --git a/bt_server/CMakeLists.txt b/bt_server/CMakeLists.txt
@@ -17,7 +17,7 @@ target_link_libraries(bt_server
     YARP::YARP_os
     YARP::YARP_init
     ament_index_cpp::ament_index_cpp
-    BT::behaviortree_cpp_v3
+    BT::behaviortree_cpp
     yarp_bt_nodes
     pthread)
 

diff --git a/bt_server/bt_server.h b/bt_server/bt_server.h
@@ -23,21 +23,21 @@
 #include <atomic>
 
 #ifdef ZMQ_FOUND
-#include "behaviortree_cpp_v3/loggers/bt_zmq_publisher.h"
+#include "behaviortree_cpp/loggers/bt_zmq_publisher.h"
 #endif
 
 #include <iostream>
-#include <behaviortree_cpp_v3/behavior_tree.h>
+#include <behaviortree_cpp/behavior_tree.h>
 #include <yarp_condition.h>
 #include <yarp_action.h>
 #include <thread> // std::this_thread::sleep_for
 #include <chrono> // std::chrono::seconds
 #include <yarp/os/LogStream.h>
-#include <behaviortree_cpp_v3/bt_factory.h>
+#include <behaviortree_cpp/bt_factory.h>
 
-#include <behaviortree_cpp_v3/loggers/bt_cout_logger.h>
-#include <behaviortree_cpp_v3/loggers/bt_minitrace_logger.h>
-#include <behaviortree_cpp_v3/loggers/bt_file_logger.h>
+#include <behaviortree_cpp/loggers/bt_cout_logger.h>
+#include <behaviortree_cpp/loggers/bt_minitrace_logger.h>
+#include <behaviortree_cpp/loggers/bt_file_logger.h>
 
 #include <yarp/os/Network.h>
 #include <yarp/os/Port.h>

diff --git a/bt_server/lib/CMakeLists.txt b/bt_server/lib/CMakeLists.txt
@@ -24,5 +24,5 @@ target_link_libraries(yarp_bt_nodes
     YARP::YARP_os
     YARP::YARP_init
     ament_index_cpp::ament_index_cpp
-    BT::behaviortree_cpp_v3
+    BT::behaviortree_cpp
     skill_interface)
diff --git a/bt_server/lib/yarp_action.h b/bt_server/lib/yarp_action.h
@@ -13,7 +13,7 @@
 
 
 #include <yarp_node.h>
-#include <behaviortree_cpp_v3/action_node.h>
+#include <behaviortree_cpp/action_node.h>
 
 #include <string>
 #include <future>

diff --git a/bt_server/lib/yarp_condition.h b/bt_server/lib/yarp_condition.h
@@ -14,7 +14,7 @@
 
 #include <yarp_node.h>
 #include <string>
-#include <behaviortree_cpp_v3/condition_node.h>
+#include <behaviortree_cpp/condition_node.h>
 
 class YARPCondition :  public ConditionNode, public YARPNode
 {

diff --git a/bt_server/lib/yarp_node.cpp b/bt_server/lib/yarp_node.cpp
@@ -11,7 +11,7 @@
 
 
 #include <yarp_node.h>
-#include <behaviortree_cpp_v3/leaf_node.h>
+#include <behaviortree_cpp/leaf_node.h>
 #include <Skill_request.h>
 #include <iostream>
 #include <yarp/os/RpcClient.h>

diff --git a/bt_server/lib/yarp_node.h b/bt_server/lib/yarp_node.h
@@ -12,7 +12,7 @@
 
 #pragma once
 
-#include <behaviortree_cpp_v3/action_node.h>
+#include <behaviortree_cpp/action_node.h>
 #include <yarp/os/RpcClient.h>
 #include <Skill_request.h>
 

diff --git a/bt_server/main.cpp b/bt_server/main.cpp
@@ -10,21 +10,21 @@
  */
 
 #ifdef ZMQ_FOUND
-#include "behaviortree_cpp_v3/loggers/bt_zmq_publisher.h"
+#include "behaviortree_cpp/loggers/bt_zmq_publisher.h"
 #endif
 
 #include <iostream>
-#include <behaviortree_cpp_v3/behavior_tree.h>
+#include <behaviortree_cpp/behavior_tree.h>
 #include <yarp_condition.h>
 #include <yarp_action.h>
 #include <thread> // std::this_thread::sleep_for
 #include <chrono> // std::chrono::seconds
 #include <yarp/os/LogStream.h>
-#include <behaviortree_cpp_v3/bt_factory.h>
+#include <behaviortree_cpp/bt_factory.h>
 
-#include <behaviortree_cpp_v3/loggers/bt_cout_logger.h>
-#include <behaviortree_cpp_v3/loggers/bt_minitrace_logger.h>
-#include <behaviortree_cpp_v3/loggers/bt_file_logger.h>
+#include <behaviortree_cpp/loggers/bt_cout_logger.h>
+#include <behaviortree_cpp/loggers/bt_minitrace_logger.h>
+#include <behaviortree_cpp/loggers/bt_file_logger.h>
 
 #include <yarp/os/Network.h>
 #include <yarp/os/Port.h>