fix export dependency and library (#2521)

gezp · web-flow · commit cc8d276b7ea1 · 2021-08-19T07:54:03.000-07:00
Signed-off-by: zhenpeng ge &lt;zhenpeng.ge@qq.com&gt;
diff --git a/nav2_controller/CMakeLists.txt b/nav2_controller/CMakeLists.txt
@@ -99,6 +99,7 @@ ament_export_libraries(simple_progress_checker
   simple_goal_checker
   stopped_goal_checker
   ${library_name})
+ament_export_dependencies(${dependencies})
 pluginlib_export_plugin_description_file(nav2_core plugins.xml)
 
 ament_package()
diff --git a/nav2_map_server/CMakeLists.txt b/nav2_map_server/CMakeLists.txt
@@ -154,4 +154,5 @@ ament_export_libraries(
   ${library_name}
   ${map_io_library_name}
 )
+ament_export_dependencies(${map_io_dependencies} ${map_server_dependencies})
 ament_package()
diff --git a/nav2_recoveries/CMakeLists.txt b/nav2_recoveries/CMakeLists.txt
@@ -126,5 +126,5 @@ ament_export_libraries(${library_name}
   nav2_spin_recovery
   nav2_wait_recovery
 )
-
+ament_export_dependencies(${dependencies})
 ament_package()
diff --git a/nav2_waypoint_follower/CMakeLists.txt b/nav2_waypoint_follower/CMakeLists.txt
@@ -98,8 +98,8 @@ if(BUILD_TESTING)
 endif()
 
 ament_export_include_directories(include)
-ament_export_libraries(wait_at_waypoint photo_at_waypoint input_at_waypoint)
-
+ament_export_libraries(wait_at_waypoint photo_at_waypoint input_at_waypoint ${library_name})
+ament_export_dependencies(${dependencies})
 pluginlib_export_plugin_description_file(nav2_waypoint_follower plugins.xml)
 
 ament_package()

Original file line number	Diff line number	Diff line change
`@@ -154,4 +154,5 @@ ament_export_libraries(`
`154`	`154`	`${library_name}`
`155`	`155`	`${map_io_library_name}`
`156`	`156`	`)`
	`157`	`+ament_export_dependencies(${map_io_dependencies} ${map_server_dependencies})`
`157`	`158`	`ament_package()`
Original file line number	Diff line number	Diff line change
`@@ -126,5 +126,5 @@ ament_export_libraries(${library_name}`
`126`	`126`	`nav2_spin_recovery`
`127`	`127`	`nav2_wait_recovery`
`128`	`128`	`)`
`129`		`-`
	`129`	`+ament_export_dependencies(${dependencies})`
`130`	`130`	`ament_package()`