Included UtiLite library directly in Rtabmap source (to simplify the installation)

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@855 f169173b-cf89-36c8-b27e-44dbe73f0c83

app/src/CMakeLists.txt

@@ -13,17 +13,16 @@ SET(SRC_FILES
 )
 
 SET(INCLUDE_DIRS
+	${PROJECT_SOURCE_DIR}/utilite/include
 	${PROJECT_SOURCE_DIR}/corelib/include
 	${PROJECT_SOURCE_DIR}/guilib/include
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${UTILITE_INCLUDE_DIRS}
     ${OpenCV_INCLUDE_DIRS}
 )
 
 INCLUDE(${QT_USE_FILE})
 
 SET(LIBRARIES
-    ${UTILITE_LIBRARIES}
     ${QT_LIBRARIES} 
 	${OpenCV_LIBS} 
 )
@@ -60,7 +59,7 @@ IF(APPLE AND BUILD_AS_BUNDLE)
 ELSE()
   ADD_EXECUTABLE(main_app WIN32 ${SRC_FILES})
 ENDIF()
-TARGET_LINK_LIBRARIES(main_app rtabmap_corelib rtabmap_guilib ${LIBRARIES})
+TARGET_LINK_LIBRARIES(main_app rtabmap_corelib rtabmap_guilib rtabmap_utilite ${LIBRARIES})
 
 IF(APPLE AND BUILD_AS_BUNDLE)
   SET_TARGET_PROPERTIES(main_app PROPERTIES

app/src/ObjDeletionHandler.h

@@ -20,8 +20,8 @@
 #ifndef OBJDELETIONHANDLER_H_
 #define OBJDELETIONHANDLER_H_
 
-#include "utilite/UEventsHandler.h"
-#include "utilite/UEvent.h"
+#include "rtabmap/utilite/UEventsHandler.h"
+#include "rtabmap/utilite/UEvent.h"
 #include <QtCore/QObject>
 
 class ObjDeletionHandler : public QObject, public UEventsHandler

app/src/main.cpp

@@ -19,11 +19,11 @@
 
 #include <QtGui/QApplication>
 #include <QtCore/QDir>
-#include "utilite/UEventsManager.h"
+#include "rtabmap/utilite/UEventsManager.h"
 #include "rtabmap/core/RtabmapThread.h"
 #include "rtabmap/gui/MainWindow.h"
 #include <QtGui/QMessageBox>
-#include "utilite/UObjDeletionThread.h"
+#include "rtabmap/utilite/UObjDeletionThread.h"
 #include "ObjDeletionHandler.h"
 
 using namespace rtabmap;