diff --git a/README.md b/README.md index ff20f18..a0427be 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ source install/setup.bash ```shell # run awviz -ros2 run awviz awviz +awviz ``` ## Plugin Customization diff --git a/awviz/CMakeLists.txt b/awviz/CMakeLists.txt index 84b0773..60747a8 100644 --- a/awviz/CMakeLists.txt +++ b/awviz/CMakeLists.txt @@ -19,20 +19,12 @@ endif() # -------- find dependencies -------- find_package(ament_cmake_auto REQUIRED) -find_package(rerun_sdk REQUIRED) -find_package(awviz_common REQUIRED) ament_auto_find_build_dependencies() # -------- add executable -------- add_executable(${PROJECT_NAME} src/main.cpp) target_link_libraries(${PROJECT_NAME} awviz_common::awviz_common) -# -------- install executable -------- -install(TARGETS ${PROJECT_NAME} - DESTINATION bin - DESTINATION lib/${PROJECT_NAME} -) - # -------- for testing -------- if(BUILD_TESTING) find_package(ament_lint_auto REQUIRED) diff --git a/awviz/package.xml b/awviz/package.xml index 6d1dd4c..b0352bb 100644 --- a/awviz/package.xml +++ b/awviz/package.xml @@ -11,6 +11,7 @@ rclcpp awviz_common + rerun_sdk ament_lint_auto ament_lint_common diff --git a/awviz_common/CMakeLists.txt b/awviz_common/CMakeLists.txt index 3fd5f17..78982f7 100644 --- a/awviz_common/CMakeLists.txt +++ b/awviz_common/CMakeLists.txt @@ -19,8 +19,6 @@ endif() # -------- find dependencies -------- find_package(ament_cmake_auto REQUIRED) -find_package(rclcpp REQUIRED) -find_package(pluginlib REQUIRED) ament_auto_find_build_dependencies() # -------- fetch contents -------- diff --git a/awviz_plugin/CMakeLists.txt b/awviz_plugin/CMakeLists.txt index 91b8f1e..e94d0a3 100644 --- a/awviz_plugin/CMakeLists.txt +++ b/awviz_plugin/CMakeLists.txt @@ -19,8 +19,6 @@ endif() # -------- find dependencies -------- find_package(ament_cmake_auto REQUIRED) -find_package(rerun_sdk REQUIRED) -find_package(awviz_common REQUIRED) ament_auto_find_build_dependencies() # -------- link targets -------- diff --git a/awviz_plugin/README.md b/awviz_plugin/README.md index f18368d..532a023 100644 --- a/awviz_plugin/README.md +++ b/awviz_plugin/README.md @@ -140,11 +140,16 @@ project(my_custom_display) # -------- find dependencies -------- find_package(ament_cmake_auto REQUIRED) -# ... OTHER OPERATIONS +ament_auto_find_build_dependencies() # -------- link targets -------- add_library(${PROJECT_NAME} SHARED ${CMAKE_CURRENT_SOURCE_DIR}/src/foo.cpp) -# ... OTHER OPERATIONS +target_include_directories(${PROJECT_NAME} PUBLIC + $ + $ +) +target_link_libraries(${PROJECT_NAME} awviz_common::awviz_common rerun_sdk) +ament_target_dependencies(${PROJECT_NAME} rclcpp my_custom_msgs) # -------- export plugin description -------- pluginlib_export_plugin_description_file(awviz_common plugin_description.xml) diff --git a/awviz_plugin/package.xml b/awviz_plugin/package.xml index 49e3783..720dbf2 100644 --- a/awviz_plugin/package.xml +++ b/awviz_plugin/package.xml @@ -12,6 +12,7 @@ awviz_common cv_bridge pluginlib + rerun_sdk sensor_msgs ament_lint_auto