MERGE branch STM 325:449 into trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@450 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-03-03 01:46:30 +00:00
parent c4aff5f20a
commit a2eb8bcab6
100 changed files with 76652 additions and 5164 deletions

View File

@@ -11,6 +11,7 @@ SET(headers_ui
./PdfPlot.h
./StatsToolBox.h
./DetailedProgressDialog.h
./TwistWidget.h
)
SET(uis
@@ -49,6 +50,7 @@ SET(SRC_FILES
./DetailedProgressDialog.cpp
./AboutDialog.cpp
./ConsoleWidget.cpp
./TwistWidget.cpp
${moc_srcs}
${moc_uis}
${srcs_qrc}
@@ -57,7 +59,7 @@ SET(SRC_FILES
SET(INCLUDE_DIRS
${CMAKE_CURRENT_SOURCE_DIR}/../include
${CMAKE_CURRENT_SOURCE_DIR}
${UTILITE_INCLUDE_DIR}
${UTILITE_INCLUDE_DIRS}
${OpenCV_INCLUDE_DIRS}
${CMAKE_CURRENT_BINARY_DIR} # for qt ui generated in binary dir
)
@@ -65,7 +67,7 @@ SET(INCLUDE_DIRS
INCLUDE(${QT_USE_FILE})
SET(LIBRARIES
${UTILITE_LIBRARY}
${UTILITE_LIBRARIES}
${QT_LIBRARIES}
${OpenCV_LIBS}
)