Merge branch 'master' of https://github.com/amor-ros-pkg/rosaria

ArTimeToROSTime.h

@@ -3,7 +3,12 @@
 #define ARTIMETOROSTIMESTAMP_H
 
 #include <ros/ros.h>
+
+#ifdef ADEPT_PKG
 #include "ariaUtil.h"
+#else
+#include "Aria/ariaUtil.h"
+#endif
 
 ros::Time convertArTimeToROS(const ArTime& t)
 {

LaserPublisher.cpp

 
-#include "Aria.h"
-#include "LaserPublisher.h"
+#ifdef ADEPT_PKG
+  #include <Aria.h>
+#else
+  #include <Aria/Aria.h>
+#endif
 
+#include "LaserPublisher.h"
 #include "ArTimeToROSTime.h"