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

tools/ConsoleApp/CMakeLists.txt

@@ -4,15 +4,14 @@ SET(SRC_FILES
 )
 
 SET(INCLUDE_DIRS
+	${PROJECT_SOURCE_DIR}/utilite/include
 	${PROJECT_SOURCE_DIR}/corelib/include
     ${CMAKE_CURRENT_SOURCE_DIR}
-    ${UTILITE_INCLUDE_DIRS}
     ${OpenCV_INCLUDE_DIRS}
 	${CMAKE_CURRENT_SOURCE_DIR}/../include
 )
 
 SET(LIBRARIES
-    ${UTILITE_LIBRARIES}
 	${OpenCV_LIBRARIES} 
 )
 
@@ -22,7 +21,7 @@ INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
 # Add binary called "consoleApp" that is built from the source file "main.cpp".
 # The extension is automatically found.
 ADD_EXECUTABLE(consoleApp ${SRC_FILES})
-TARGET_LINK_LIBRARIES(consoleApp rtabmap_corelib ${LIBRARIES})
+TARGET_LINK_LIBRARIES(consoleApp rtabmap_corelib rtabmap_utilite ${LIBRARIES})
 
 SET_TARGET_PROPERTIES( consoleApp 
   PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-console)

tools/ConsoleApp/main.cpp

@@ -17,14 +17,14 @@
  * along with RTAB-Map.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include <utilite/ULogger.h>
-#include <utilite/UTimer.h>
+#include <rtabmap/utilite/ULogger.h>
+#include <rtabmap/utilite/UTimer.h>
 #include "rtabmap/core/Rtabmap.h"
 #include "rtabmap/core/Camera.h"
-#include <utilite/UDirectory.h>
-#include <utilite/UFile.h>
-#include <utilite/UConversion.h>
-#include <utilite/UStl.h>
+#include <rtabmap/utilite/UDirectory.h>
+#include <rtabmap/utilite/UFile.h>
+#include <rtabmap/utilite/UConversion.h>
+#include <rtabmap/utilite/UStl.h>
 #include <fstream>
 #include <queue>
 #include <opencv2/core/core.hpp>