Added install targets for dataRecorder and odometryViewer

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

CMakeLists.txt

@@ -127,7 +127,6 @@ set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH
   "Installation directory for CMake files")
   
 ####### BUILD OPTIONS #######
-OPTION(BUILD_LIBS_ONLY "Set to ON to build only the libraries" OFF)
 IF(APPLE)
 	OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
 ENDIF(APPLE)
@@ -151,12 +150,6 @@ IF(APPLE AND BUILD_AS_BUNDLE)
     	SET( BUILD_SHARED_LIBS OFF )
     ENDIF(BUILD_SHARED_LIBS)
     
-    #Must create app, so force to off BUILD_LIBS_ONLY
-    IF(BUILD_LIBS_ONLY)
-   		MESSAGE(STATUS "As BUILD_AS_BUNDLE=ON, set BUILD_LIBS_ONLY=OFF")
-   		SET( BUILD_LIBS_ONLY OFF )
-    ENDIF(BUILD_LIBS_ONLY)
-    
     # Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
     SET(CMAKE_INSTALL_PREFIX "/")
     SET(CPACK_SET_DESTDIR TRUE) 
@@ -188,17 +181,13 @@ ADD_SUBDIRECTORY( corelib )
 
 IF(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND)
    ADD_SUBDIRECTORY( guilib )
-   IF(NOT BUILD_LIBS_ONLY)
+   ADD_SUBDIRECTORY( app )
-   	 ADD_SUBDIRECTORY( app )
-   ENDIF(NOT BUILD_LIBS_ONLY)
 ELSE()
    MESSAGE(STATUS "[WARNING] Qt4 not found, the GUI lib and the stand-alone application will not be compiled...")
 ENDIF()
 
-IF(NOT BUILD_LIBS_ONLY AND NOT BUILD_AS_BUNDLE)
+ADD_SUBDIRECTORY( tools )
-	ADD_SUBDIRECTORY( tools )
+ADD_SUBDIRECTORY( examples )
-	ADD_SUBDIRECTORY( examples )
-ENDIF(NOT BUILD_LIBS_ONLY AND NOT BUILD_AS_BUNDLE)
 
 #######################
 # Uninstall target, for "make uninstall"
@@ -325,7 +314,6 @@ IF(NOT WIN32)
 	# see comment above for the BUILD_SHARED_LIBS option on Windows
 	MESSAGE(STATUS "  BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}")
 ENDIF(NOT WIN32)
-MESSAGE(STATUS "  BUILD_LIBS_ONLY = ${BUILD_LIBS_ONLY}")
 IF(APPLE)
 MESSAGE(STATUS "  BUILD_AS_BUNDLE = ${BUILD_AS_BUNDLE}")
 ENDIF(APPLE)

guilib/include/rtabmap/gui/DatabaseViewer.h

@@ -74,7 +74,6 @@ private:
 	void updateIds();
 	void update(int value,
 				QLabel * labelIndex,
-				QLabel * labelActions,
 				QLabel * labelParents,
 				QLabel * labelChildren,
 				rtabmap::ImageView * view,

guilib/src/DatabaseViewer.cpp

@@ -627,7 +627,6 @@ void DatabaseViewer::sliderAValueChanged(int value)
 {
 	this->update(value,
 			ui_->label_indexA,
-			ui_->label_actionsA,
 			ui_->label_parentsA,
 			ui_->label_childrenA,
 			ui_->graphicsView_A,
@@ -638,7 +637,6 @@ void DatabaseViewer::sliderBValueChanged(int value)
 {
 	this->update(value,
 			ui_->label_indexB,
-			ui_->label_actionsB,
 			ui_->label_parentsB,
 			ui_->label_childrenB,
 			ui_->graphicsView_B,
@@ -647,7 +645,6 @@ void DatabaseViewer::sliderBValueChanged(int value)
 
 void DatabaseViewer::update(int value,
 						QLabel * labelIndex,
-						QLabel * labelActions,
 						QLabel * labelParents,
 						QLabel * labelChildren,
 						rtabmap::ImageView * view,
@@ -655,7 +652,6 @@ void DatabaseViewer::update(int value,
 {
 	UTimer timer;
 	labelIndex->setText(QString::number(value));
-	labelActions->clear();
 	labelParents->clear();
 	labelChildren->clear();
 	if(value >= 0 && value < ids_.size())

guilib/src/ui/DatabaseViewer.ui

@@ -47,41 +47,27 @@
            </property>
            <layout class="QGridLayout" name="gridLayout" columnstretch="0,1">
             <item row="0" column="0">
-             <widget class="QLabel" name="label_actionsA_2">
-              <property name="text">
-               <string>Actions</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="label_actionsA">
-              <property name="text">
-               <string>Actions</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
              <widget class="QLabel" name="label_parentsA_2">
               <property name="text">
                <string>Parents</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="0" column="1">
              <widget class="QLabel" name="label_parentsA">
               <property name="text">
                <string>Parents</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="1" column="0">
              <widget class="QLabel" name="label_childrenA_2">
               <property name="text">
                <string>Children</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
+            <item row="1" column="1">
              <widget class="QLabel" name="label_childrenA">
               <property name="text">
                <string>Children</string>
@@ -171,41 +157,27 @@
            </property>
            <layout class="QGridLayout" name="gridLayout_2" columnstretch="0,1">
             <item row="0" column="0">
-             <widget class="QLabel" name="label_actionsA_4">
-              <property name="text">
-               <string>Actions</string>
-              </property>
-             </widget>
-            </item>
-            <item row="0" column="1">
-             <widget class="QLabel" name="label_actionsB">
-              <property name="text">
-               <string>Actions</string>
-              </property>
-             </widget>
-            </item>
-            <item row="1" column="0">
              <widget class="QLabel" name="label_parentsA_4">
               <property name="text">
                <string>Parents</string>
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="0" column="1">
              <widget class="QLabel" name="label_parentsB">
               <property name="text">
                <string>Parents</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="0">
+            <item row="1" column="0">
              <widget class="QLabel" name="label_childrenA_3">
               <property name="text">
                <string>Children</string>
               </property>
              </widget>
             </item>
-            <item row="2" column="1">
+            <item row="1" column="1">
              <widget class="QLabel" name="label_childrenB">
               <property name="text">
                <string>Children</string>

tools/CMakeLists.txt

@@ -3,12 +3,8 @@ ADD_SUBDIRECTORY( ConsoleApp )
 ADD_SUBDIRECTORY( ImagesJoiner )
 ADD_SUBDIRECTORY( ImagesDbExtractor )
 ADD_SUBDIRECTORY( VocabularyComparison )
-
+ADD_SUBDIRECTORY( OdometryViewer )
-#On linux, we use ros package as OpenniCamera
+ADD_SUBDIRECTORY( DataRecorder )
-IF(WIN32 OR APPLE)
-	ADD_SUBDIRECTORY( OdometryViewer )
-	ADD_SUBDIRECTORY( DataRecorder )
-ENDIF(WIN32 OR APPLE)
 
 IF(TARGET rtabmap_gui)
 	ADD_SUBDIRECTORY( DatabaseViewer )

tools/DataRecorder/CMakeLists.txt

@@ -32,3 +32,6 @@ TARGET_LINK_LIBRARIES(dataRecorder rtabmap_core rtabmap_gui rtabmap_utilite ${LI
 SET_TARGET_PROPERTIES( dataRecorder 
   PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-dataRecorder)
 
+INSTALL(TARGETS dataRecorder
+		RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
+		BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)

tools/DataRecorder/main.cpp

@@ -4,7 +4,7 @@
 #include <rtabmap/core/Camera.h>
 #include <rtabmap/core/CameraThread.h>
 #include <rtabmap/gui/DataRecorder.h>
-#include <QtGui/QApplication.h>
+#include <QtGui/QApplication>
 #include <signal.h>
 
 using namespace rtabmap;

tools/DatabaseViewer/CMakeLists.txt

@@ -32,3 +32,4 @@ TARGET_LINK_LIBRARIES(databaseViewer rtabmap_core rtabmap_gui rtabmap_utilite ${
 SET_TARGET_PROPERTIES( databaseViewer 
   PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-databaseViewer)
 
+

tools/OdometryViewer/CMakeLists.txt

@@ -31,4 +31,8 @@ TARGET_LINK_LIBRARIES(odometryViewer rtabmap_core rtabmap_gui rtabmap_utilite ${
 
 SET_TARGET_PROPERTIES( odometryViewer 
   PROPERTIES OUTPUT_NAME ${PROJECT_PREFIX}-odometryViewer)
+  
+INSTALL(TARGETS odometryViewer
+		RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT runtime
+		BUNDLE DESTINATION "${CMAKE_BUNDLE_LOCATION}" COMPONENT runtime)
 

tools/OdometryViewer/main.cpp

@@ -4,7 +4,7 @@
 #include <rtabmap/core/Odometry.h>
 #include <rtabmap/gui/OdometryViewer.h>
 #include <rtabmap/core/CameraOpenni.h>
-#include <QtGui/QApplication.h>
+#include <QtGui/QApplication>
 
 void showUsage()
 {