Updating install paths and includes

Findlaser_scan_utils.cmake

 #edit the following line to add the librarie's header files
 FIND_PATH(
     laser_scan_utils_INCLUDE_DIRS
-    NAMES corner_detector.h entities.h line_fitting.h scan_basics.h types_laser_scan_utils.h clustering.h object_detector.h
-    PATHS /usr/local/include/iri-algorithms/laser_scan_utils
+    NAMES laser_scan_utils.h
+    PATHS /usr/local/include/iri-algorithms
 )
 
 FIND_LIBRARY(
     laser_scan_utils_LIBRARY
     NAMES laser_scan_utils
-    PATHS /usr/lib /usr/local/lib /usr/local/lib/iri-algorithms/laser_scan_utils) 
+    PATHS /usr/lib /usr/local/lib /usr/local/lib/iri-algorithms) 
 
 IF (laser_scan_utils_INCLUDE_DIRS AND laser_scan_utils_LIBRARY)
    SET(laser_scan_utils_FOUND TRUE)

src/CMakeLists.txt

@@ -20,12 +20,14 @@ IF(faramotics_FOUND)
 ENDIF(faramotics_FOUND)
 
 #headers
+SET(HDRS_BASE
+    laser_scan_utils.h)
+    
 SET(HDRS
     corner_detector.h
     entities.h
     line_detector.h
     scan_basics.h
-    types_laser_scan_utils.h
     clustering.h
     object_detector.h)
 
@@ -44,10 +46,12 @@ ADD_LIBRARY(${PROJECT_NAME} SHARED ${SRCS})
 #install library
 INSTALL(TARGETS ${PROJECT_NAME}
       RUNTIME DESTINATION bin
-      LIBRARY DESTINATION lib/iri-algorithms/laser_scan_utils
-      ARCHIVE DESTINATION lib/iri-algorithms/laser_scan_utils)
+      LIBRARY DESTINATION lib/iri-algorithms
+      ARCHIVE DESTINATION lib/iri-algorithms)
         
 #install headers         
+INSTALL(FILES ${HDRS_BASE} 
+      DESTINATION include/iri-algorithms)
 INSTALL(FILES ${HDRS} 
       DESTINATION include/iri-algorithms/laser_scan_utils)
 

src/clustering.h

@@ -2,7 +2,7 @@
 #define CLUSTERING_H
 
 //laserscanutils
-#include "types_laser_scan_utils.h"
+#include "laser_scan_utils.h"
 #include "entities.h"
 #include "scan_basics.h"
 #include "corner_detector.h"

src/corner_detector.h

@@ -12,7 +12,7 @@
 #include <eigen3/Eigen/Geometry>
 
 //laserscanutils
-#include "types_laser_scan_utils.h"
+#include "laser_scan_utils.h"
 #include "scan_basics.h"
 #include "entities.h"
 #include "line_detector.h"

src/entities.h

@@ -3,7 +3,7 @@
 #define ENTITIES_H_
 
 //laserscanutils
-#include "types_laser_scan_utils.h"
+#include "laser_scan_utils.h"
 
 #include <iostream>
 #include <list>

src/line_detector.h

@@ -3,7 +3,7 @@
 #define LINE_DETECTOR_H_
 
 //laserscanutils
-#include "types_laser_scan_utils.h"
+#include "laser_scan_utils.h"
 #include "entities.h"
 #include "scan_basics.h"
 

src/object_detector.h

@@ -11,7 +11,7 @@
 #include <eigen3/Eigen/Geometry>
 
 //laserscanutils
-#include "types_laser_scan_utils.h"
+#include "laser_scan_utils.h"
 #include "entities.h"
 #include "scan_basics.h"
 #include "line_detector.h"

src/scan_basics.h

@@ -9,7 +9,7 @@
 #include <list>
 
 //laserscanutils
-#include "types_laser_scan_utils.h"
+#include "laser_scan_utils.h"
 
 namespace laserscanutils
 {