diff --git a/.github/workflows/build-and-test.yaml b/.github/workflows/build-and-test.yaml index 7395eed..dcfeaf3 100644 --- a/.github/workflows/build-and-test.yaml +++ b/.github/workflows/build-and-test.yaml @@ -40,5 +40,4 @@ jobs: with: package-name: ${{ steps.list_packages.outputs.packages }} target-ros2-distro: ${{ matrix.rosdistro }} - vcs-repo-file-url: autoware.repos import-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/.gitignore b/.gitignore index e77810d..f914f35 100644 --- a/.gitignore +++ b/.gitignore @@ -56,9 +56,6 @@ COLCON_IGNORE # VSCode .vscode -# Clang -compile_flags.txt - .cache html latex diff --git a/README.md b/README.md index eb51538..6beeff6 100644 --- a/README.md +++ b/README.md @@ -15,9 +15,10 @@ AWViz-ROS features a ROS viewer for [Autoware](https://autoware.org) powered by git clone git@github.com:ktro2828/awviz-ros && cd awviz-ros # import external dependencies -mkdir src && vcs import src < autoware.repos +rosdep update +rosdep install -y --from-paths . --ignore-src --rosdistro $ROS_DISTRO -# build awviz +# build awviz packages colon build --symlink-install --cmake-args -DCMAKE_BUILD_TYPE=Release source install/setup.bash ``` diff --git a/autoware.repos b/autoware.repos deleted file mode 100644 index 0b81f20..0000000 --- a/autoware.repos +++ /dev/null @@ -1,5 +0,0 @@ -repositories: - autoware_msgs: - type: git - url: https://github.com/autowarefoundation/autoware_msgs.git - version: main diff --git a/awviz/CMakeLists.txt b/awviz/CMakeLists.txt index 25edd16..e62323b 100644 --- a/awviz/CMakeLists.txt +++ b/awviz/CMakeLists.txt @@ -19,11 +19,12 @@ endif() # -------- find dependencies -------- find_package(ament_cmake_auto REQUIRED) +find_package(rerun_sdk REQUIRED) ament_auto_find_build_dependencies() # -------- add executable -------- add_executable(${PROJECT_NAME} src/main.cpp) -target_link_libraries(${PROJECT_NAME} awviz_common::awviz_common) +target_link_libraries(${PROJECT_NAME} awviz_common::awviz_common rerun_sdk) # -------- install executable -------- install(TARGETS ${PROJECT_NAME} diff --git a/awviz/package.xml b/awviz/package.xml index 4c99917..0a2af1a 100644 --- a/awviz/package.xml +++ b/awviz/package.xml @@ -11,7 +11,6 @@ rclcpp awviz_common - rerun_sdk ament_lint_auto ament_lint_common diff --git a/awviz_plugin/CMakeLists.txt b/awviz_plugin/CMakeLists.txt index 0054214..c607c4d 100644 --- a/awviz_plugin/CMakeLists.txt +++ b/awviz_plugin/CMakeLists.txt @@ -19,6 +19,7 @@ endif() # -------- find dependencies -------- find_package(ament_cmake_auto REQUIRED) +find_package(rerun_sdk REQUIRED) ament_auto_find_build_dependencies() # -------- link targets -------- diff --git a/awviz_plugin/package.xml b/awviz_plugin/package.xml index 2889524..5c211e9 100644 --- a/awviz_plugin/package.xml +++ b/awviz_plugin/package.xml @@ -12,8 +12,8 @@ awviz_common cv_bridge pluginlib - rerun_sdk sensor_msgs + rclcpp autoware_perception_msgs ament_lint_auto