merged attention branch to trunk

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

tools/DatabaseViewer/CMakeLists.txt

@@ -1,25 +1,7 @@
-### Qt Gui stuff ###
-SET(headers_ui 
-	./MainWindow.h
-)
-
-SET(uis
-    ./ui/MainWindow.ui
-)
-
-#Generate .h files from the .ui files
-QT4_WRAP_UI(moc_uis ${uis})
-
-#This will generate moc_* for Qt
-QT4_WRAP_CPP(moc_srcs ${headers_ui})
-### Qt Gui stuff  end###
 
 
 SET(SRC_FILES 
 	./main.cpp
-	./MainWindow.cpp
-	${moc_srcs} 
-	${moc_uis} 
 )
 
 SET(INCLUDE_DIRS
@@ -27,7 +9,6 @@ SET(INCLUDE_DIRS
 	${PROJECT_SOURCE_DIR}/guilib/include
 	${UTILITE_INCLUDE_DIRS}
 	${OpenCV_INCLUDE_DIRS}
-	${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir
 )
 
 INCLUDE(${QT_USE_FILE})
@@ -36,7 +17,6 @@ SET(LIBRARIES
     ${UTILITE_LIBRARIES}
     ${QT_LIBRARIES} 
 	${OpenCV_LIBRARIES} 
-	#${QWT5_LIBRARY} 
 )
 
 #include files