Fix for https://github.com/HKUST-Aerial-Robotics/Fast-Planner to support catkin build
under ROS Melodic
Created
August 2, 2021 09:09
-
-
Save 3zuli/f76936b75ef6aef3a203a1402f559d5c to your computer and use it in GitHub Desktop.
Fix for Fast-Planner to support `catkin build` under ROS Melodic
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/fast_planner/bspline_opt/CMakeLists.txt b/fast_planner/bspline_opt/CMakeLists.txt | |
index 7fd1518..ef36d74 100755 | |
--- a/fast_planner/bspline_opt/CMakeLists.txt | |
+++ b/fast_planner/bspline_opt/CMakeLists.txt | |
@@ -27,6 +27,7 @@ include_directories( | |
${catkin_INCLUDE_DIRS} | |
${Eigen3_INCLUDE_DIRS} | |
${PCL_INCLUDE_DIRS} | |
+ ${nlopt_INCLUDE_DIRS} | |
) | |
set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS} -O3 -Wall") | |
@@ -36,4 +37,5 @@ add_library( bspline_opt | |
) | |
target_link_libraries( bspline_opt | |
${catkin_LIBRARIES} | |
+ ${nlopt_LIBRARIES} | |
) | |
diff --git a/fast_planner/bspline_opt/package.xml b/fast_planner/bspline_opt/package.xml | |
index f0f2dc9..d2f9aef 100755 | |
--- a/fast_planner/bspline_opt/package.xml | |
+++ b/fast_planner/bspline_opt/package.xml | |
@@ -53,6 +53,7 @@ | |
<build_depend>rospy</build_depend> | |
<build_depend>std_msgs</build_depend> | |
<build_depend>plan_env</build_depend> | |
+ <build_depend>nlopt</build_depend> | |
<build_export_depend>roscpp</build_export_depend> | |
<build_export_depend>rospy</build_export_depend> | |
<build_export_depend>std_msgs</build_export_depend> | |
diff --git a/uav_simulator/Utils/multi_map_server/CMakeLists.txt b/uav_simulator/Utils/multi_map_server/CMakeLists.txt | |
index 29cd556..37237f9 100755 | |
--- a/uav_simulator/Utils/multi_map_server/CMakeLists.txt | |
+++ b/uav_simulator/Utils/multi_map_server/CMakeLists.txt | |
@@ -166,7 +166,7 @@ add_dependencies(multi_map_visualization multi_map_server_messages_cpp) | |
target_link_libraries(multi_map_visualization | |
${catkin_LIBRARIES} | |
${ARMADILLO_LIBRARIES} | |
- pose_utils | |
+ ${pose_utils_LIBRARIES} | |
) | |
############# | |
diff --git a/uav_simulator/Utils/odom_visualization/CMakeLists.txt b/uav_simulator/Utils/odom_visualization/CMakeLists.txt | |
index 7b42d04..9bc9c46 100755 | |
--- a/uav_simulator/Utils/odom_visualization/CMakeLists.txt | |
+++ b/uav_simulator/Utils/odom_visualization/CMakeLists.txt | |
@@ -159,7 +159,7 @@ add_executable(odom_visualization src/odom_visualization.cpp) | |
target_link_libraries(odom_visualization | |
${catkin_LIBRARIES} | |
${ARMADILLO_LIBRARIES} | |
- pose_utils | |
+ ${pose_utils_LIBRARIES} | |
) | |
############# | |
diff --git a/uav_simulator/so3_disturbance_generator/CMakeLists.txt b/uav_simulator/so3_disturbance_generator/CMakeLists.txt | |
index 235b842..57275b7 100755 | |
--- a/uav_simulator/so3_disturbance_generator/CMakeLists.txt | |
+++ b/uav_simulator/so3_disturbance_generator/CMakeLists.txt | |
@@ -71,6 +71,6 @@ add_dependencies(so3_disturbance_generator ${PROJECT_NAME}_gencfg) | |
target_link_libraries(so3_disturbance_generator | |
${catkin_LIBRARIES} | |
${ARMADILLO_LIBRARIES} | |
- pose_utils | |
+ ${pose_utils_LIBRARIES} | |
) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment