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

Conflicts:
	RosAria.cpp

CMakeLists.txt

@@ -39,11 +39,20 @@ generate_dynamic_reconfigure_options(cfg/RosAria.cfg)
 find_package(Boost REQUIRED COMPONENTS thread)
 include_directories(${catkin_INCLUDE_DIRS} ${Boost_INCLUDE_DIRS} )
 
-# The installation package provided by Adept doesn't follow Debian policies
-if(EXISTS "/usr/local/Aria/include/Aria.h")
-  add_definitions(-DADEPT_PKG)
-  include_directories( /usr/local/Aria/include)
-  link_directories(/usr/local/Aria/lib)
+find_package(Aria REQUIRED)
+if(Aria_FOUND)
+	if(EXISTS "${Aria_INCLUDE_DIRS}/Aria.h")
+		add_definitions(-DADEPT_PKG)
+	endif()
+  include_directories(${Aria_INCLUDE_DIRS})
+  link_directories(${Aria_LIBRARY_DIRS})
+else()
+	# The installation package provided by Adept doesn't follow Debian policies
+	if(EXISTS "/usr/local/Aria/include/Aria.h")
+	  add_definitions(-DADEPT_PKG)
+	  include_directories( /usr/local/Aria/include)
+	  link_directories(/usr/local/Aria/lib)
+	endif()
 endif()
 
 add_executable(RosAria RosAria.cpp)