modified library path to uam/

Finduam_task_ctrl.cmake

@@ -3,7 +3,7 @@ FIND_PATH(uam_task_ctrl_INCLUDE_DIR uam_task_ctrl.h /usr/include/iridrivers /usr
 
 FIND_LIBRARY(uam_task_ctrl_LIBRARY
     NAMES uam_task_ctrl
-    PATHS /usr/lib /usr/lib/iridrivers /usr/local/lib /usr/local/lib/iridrivers) 
+    PATHS /usr/lib /usr/lib/iridrivers /usr/lib/iridrivers/uam /usr/local/lib /usr/local/lib/iridrivers /usr/local/lib/iridrivers/uam) 
 
 IF (uam_task_ctrl_INCLUDE_DIR AND uam_task_ctrl_LIBRARY)
    SET(uam_task_ctrl_FOUND TRUE)

src/CMakeLists.txt

@@ -2,7 +2,8 @@
 SET(sources common_fc.cpp kinematics.cpp uam_task_ctrl.cpp tasks/ir.cpp tasks/vs.cpp tasks/cog.cpp tasks/jl.cpp)
 
 # application header files
-SET(headers common_obj.h common_fc.h kinematics.h uam_task_ctrl.h tasks/ir.h tasks/vs.h tasks/cog.h tasks/jl.h)
+SET(headers common_obj.h common_fc.h kinematics.h uam_task_ctrl.h)
+SET(headers_tasks tasks/ir.h tasks/vs.h tasks/cog.h tasks/jl.h)
 
 # locate the necessary dependencies
 
@@ -37,10 +38,11 @@ TARGET_LINK_LIBRARIES(uam_task_ctrl ${EIGEN3_LIBRARY} ${Boost_LIBRARIES})
 # link necessary libraries
 INSTALL(TARGETS uam_task_ctrl
         RUNTIME DESTINATION bin
-        LIBRARY DESTINATION lib/iridrivers
-        ARCHIVE DESTINATION lib/iridrivers)
+        LIBRARY DESTINATION lib/iridrivers/uam
+        ARCHIVE DESTINATION lib/iridrivers/uam)
 
-INSTALL(FILES ${headers} DESTINATION include/iridrivers)
+INSTALL(FILES ${headers} DESTINATION include/iridrivers/uam)
+INSTALL(FILES ${headers_tasks} DESTINATION include/iridrivers/uam/tasks)
 
 INSTALL(FILES ../Finduam_task_ctrl.cmake DESTINATION ${CMAKE_ROOT}/Modules/)
 

src/kinematics.h

@@ -18,8 +18,8 @@
 #include <kdl/chainjnttojacsolver.hpp>
 
 // Own stuff
-#include <common_obj.h>
-#include <common_fc.h>
+#include "common_obj.h"
+#include "common_fc.h"
 
 namespace UAM {
 

src/uam_task_ctrl.h

@@ -29,9 +29,9 @@
 #include <boost/shared_ptr.hpp>
 
 // Own libraries
-#include <common_fc.h>
-#include <common_obj.h>
-#include <kinematics.h>
+#include "common_fc.h"
+#include "common_obj.h"
+#include "kinematics.h"
 
 using namespace Eigen;
 using namespace KDL;