Compare commits
No commits in common. "b3be5da393abee4ef535f68f702cd84c02f3b98b" and "2bcd8e606bb6b8f4bdbcd6cb5f3b87e829bf7816" have entirely different histories.
b3be5da393
...
2bcd8e606b
|
|
@ -71,7 +71,8 @@ target_link_libraries(costmap_2d
|
||||||
xmlrpcpp # XMLRPC
|
xmlrpcpp # XMLRPC
|
||||||
yaml-cpp
|
yaml-cpp
|
||||||
dl
|
dl
|
||||||
robot_cpp
|
robot::node_handle
|
||||||
|
robot::console
|
||||||
)
|
)
|
||||||
|
|
||||||
# --- Include directories cho target ---
|
# --- Include directories cho target ---
|
||||||
|
|
@ -126,9 +127,11 @@ target_link_libraries(plugins
|
||||||
${Boost_LIBRARIES}
|
${Boost_LIBRARIES}
|
||||||
yaml-cpp
|
yaml-cpp
|
||||||
robot_time
|
robot_time
|
||||||
robot_cpp
|
robot::node_handle
|
||||||
|
robot::console
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
# --- Option để bật/tắt test ---
|
# --- Option để bật/tắt test ---
|
||||||
option(BUILD_COSTMAP_TESTS "Build costmap_2d test executables" ON)
|
option(BUILD_COSTMAP_TESTS "Build costmap_2d test executables" ON)
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -41,7 +41,7 @@ static boost::shared_ptr<Layer> create_critical_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_critical_plugin, CriticalLayer)
|
BOOST_DLL_ALIAS(create_critical_plugin, create_critical_layer)
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -433,5 +433,5 @@ namespace costmap_2d
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_directional_plugin, DirectionalLayer)
|
BOOST_DLL_ALIAS(create_directional_plugin, create_directional_layer)
|
||||||
}
|
}
|
||||||
|
|
@ -414,6 +414,6 @@ static boost::shared_ptr<Layer> create_inflation_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_inflation_plugin, InflationLayer)
|
BOOST_DLL_ALIAS(create_inflation_plugin, create_inflation_layer)
|
||||||
|
|
||||||
} // namespace costmap_2d
|
} // namespace costmap_2d
|
||||||
|
|
|
||||||
|
|
@ -595,6 +595,6 @@ static boost::shared_ptr<Layer> create_obstacle_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_obstacle_plugin, ObstacleLayer)
|
BOOST_DLL_ALIAS(create_obstacle_plugin, create_obstacle_layer)
|
||||||
|
|
||||||
} // namespace costmap_2d
|
} // namespace costmap_2d
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,6 @@ static boost::shared_ptr<Layer> create_preferred_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_preferred_plugin, PreferredLayer)
|
BOOST_DLL_ALIAS(create_preferred_plugin, create_preferred_layer)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -387,6 +387,6 @@ static boost::shared_ptr<Layer> create_static_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_static_plugin, StaticLayer)
|
BOOST_DLL_ALIAS(create_static_plugin, create_static_layer)
|
||||||
|
|
||||||
} // namespace costmap_2d
|
} // namespace costmap_2d
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,6 @@ static boost::shared_ptr<Layer> create_unpreferred_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_unpreferred_plugin, UnPreferredLayer)
|
BOOST_DLL_ALIAS(create_unpreferred_plugin, create_unpreferred_layer)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -488,6 +488,6 @@ static boost::shared_ptr<Layer> create_voxel_plugin() {
|
||||||
}
|
}
|
||||||
|
|
||||||
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
// Alias cho Boost.DLL (nếu muốn dùng boost::dll::import_alias)
|
||||||
BOOST_DLL_ALIAS(create_voxel_plugin, VoxelLayer)
|
BOOST_DLL_ALIAS(create_voxel_plugin, create_voxel_layer)
|
||||||
|
|
||||||
} // namespace costmap_2d
|
} // namespace costmap_2d
|
||||||
|
|
|
||||||
|
|
@ -219,7 +219,7 @@ void Costmap2DROBOT::getParams(const std::string& config_file_name, robot::NodeH
|
||||||
}
|
}
|
||||||
catch (std::exception &ex)
|
catch (std::exception &ex)
|
||||||
{
|
{
|
||||||
robot::log_error("Failed to create the %s, are you sure it is properly registered and that the containing library is built? Exception: %s\n", info.name.c_str(), ex.what());
|
printf("Failed to create the %s, are you sure it is properly registered and that the containing library is built? Exception: %s\n", info.name.c_str(), ex.what());
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user