Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix compilation issues on ros melodic (ubuntu 18.04) #6

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
+8 −6
Open

Fix compilation issues on ros melodic (ubuntu 18.04) #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
540b59b
use nlopt from ros-melodic
john-tornblom Nov 13, 2019
4f0b34f
Let cmake determine which pose_utils libs to link with
john-tornblom Nov 13, 2019
a773edb
use pluginlib 1.9 API (shipped with ros-melodic)
john-tornblom Nov 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion dyn_planner/bspline_opt/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ find_package(catkin REQUIRED COMPONENTS
std_msgs
visualization_msgs
plan_env
nlopt
)


Expand All @@ -26,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")
Expand All @@ -36,5 +38,5 @@ add_library( bspline_opt
)
target_link_libraries( bspline_opt
${catkin_LIBRARIES}
/usr/local/lib/libnlopt.so
${nlopt_LIBRARIES}
)
1 change: 1 addition & 0 deletions dyn_planner/bspline_opt/package.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion uav_simulator/Utils/multi_map_server/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

#############
Expand Down
2 changes: 1 addition & 1 deletion uav_simulator/odom_visualization/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}
)

#############
Expand Down
3 changes: 1 addition & 2 deletions uav_simulator/so3_control/src/so3_control_nodelet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,5 +214,4 @@ SO3ControlNodelet::onInit(void)
}

#include <pluginlib/class_list_macros.h>
PLUGINLIB_DECLARE_CLASS(so3_control, SO3ControlNodelet, SO3ControlNodelet,
nodelet::Nodelet);
PLUGINLIB_EXPORT_CLASS(SO3ControlNodelet, nodelet::Nodelet);
2 changes: 1 addition & 1 deletion uav_simulator/so3_disturbance_generator/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ add_dependencies(so3_disturbance_generator ${PROJECT_NAME}_gencfg)
target_link_libraries(so3_disturbance_generator
${catkin_LIBRARIES}
${ARMADILLO_LIBRARIES}
pose_utils
${pose_utils_LIBRARIES}
)