From 598f597d53803c9ae486e6d26b54044134d461d4 Mon Sep 17 00:00:00 2001
From: Jakub Delicat <jakub.delicat@husarion.com>
Date: Wed, 21 Sep 2022 18:10:39 +0200
Subject: [PATCH] project builds

---
 .vscode/settings.json       | 3 ++-
 Dockerfile                  | 1 +
 compose.ros2aria.yaml       | 5 +++++
 src/ros2aria/CMakeLists.txt | 5 +----
 4 files changed, 9 insertions(+), 5 deletions(-)
 create mode 100644 compose.ros2aria.yaml

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 3baa025..2780424 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -87,5 +87,6 @@
     ],
     "python.analysis.extraPaths": [
         "/opt/ros/foxy/lib/python3.8/site-packages"
-    ]
+    ],
+    "ros.distro": "humble"
 }
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 231df35..36985d5 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -11,6 +11,7 @@ RUN apt-get update && \
 
 COPY ./src/AriaCoda /usr/local/Aria
 RUN cd /usr/local/Aria && make -j$(nproc)
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/Aria/lib
 
 RUN echo "source /opt/ros/$ROS_DISTRO/setup.bash" >> ~/.bashrc
 COPY ros_entrypoint.sh /
diff --git a/compose.ros2aria.yaml b/compose.ros2aria.yaml
new file mode 100644
index 0000000..244fed5
--- /dev/null
+++ b/compose.ros2aria.yaml
@@ -0,0 +1,5 @@
+version: "3"
+services:
+  ros2aria:
+   build: .
+   command: ros2 run ros2aria ros2aria
\ No newline at end of file
diff --git a/src/ros2aria/CMakeLists.txt b/src/ros2aria/CMakeLists.txt
index 1db7cb0..86835b9 100644
--- a/src/ros2aria/CMakeLists.txt
+++ b/src/ros2aria/CMakeLists.txt
@@ -26,9 +26,6 @@ find_package(tf2 REQUIRED)
 find_package(tf2_ros REQUIRED)
 find_package(tf2_geometry_msgs REQUIRED)
 find_package(ros2aria_msgs REQUIRED)
-# uncomment the following section in order to fill in
-# further dependencies manually.
-# find_package(<dependency> REQUIRED)
 
 
 add_executable(ros2aria
@@ -63,7 +60,7 @@ target_include_directories(ros2aria PUBLIC
 target_link_libraries(ros2aria /usr/local/Aria/lib/libAria.so)
 
 install(TARGETS ros2aria
-  DESTINATION lib/${PROJECT_NAME})
+  DESTINATION lib/${PROJECT_NAME} )
 
 if(BUILD_TESTING)
   find_package(ament_lint_auto REQUIRED)