up...

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

tools/CMakeLists.txt

@@ -4,9 +4,9 @@ ADD_SUBDIRECTORY( ImagesJoiner )
 ADD_SUBDIRECTORY( ImagesDbExtractor )
 ADD_SUBDIRECTORY( VocabularyComparison )
 
-IF(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND)
+IF(TARGET rtabmap_guilib)
 	ADD_SUBDIRECTORY( DatabaseViewer )
 	ADD_SUBDIRECTORY( EpipolarGeometry )
 ELSE()
-   MESSAGE(STATUS "[WARNING] Qt4 not found, the databaseViewer and epipolarGeometry programs will not be built...")
+   MESSAGE(STATUS "RTAB-Map GUI lib is not built, the databaseViewer and epipolarGeometry programs will not be built...")
 ENDIF()

tools/DatabaseViewer/CMakeLists.txt

@@ -1,29 +1,25 @@
 
-
 SET(SRC_FILES
-	./main.cpp
+    main.cpp
 )
 
 SET(INCLUDE_DIRS
 	${PROJECT_SOURCE_DIR}/corelib/include
 	${PROJECT_SOURCE_DIR}/guilib/include
-	${UTILITE_INCLUDE_DIRS}
-	${OpenCV_INCLUDE_DIRS}
+    ${UTILITE_INCLUDE_DIRS}
+    ${OpenCV_INCLUDE_DIRS}
 )
 
 INCLUDE(${QT_USE_FILE})
 
 SET(LIBRARIES
     ${UTILITE_LIBRARIES}
-    ${QT_LIBRARIES} 
 	${OpenCV_LIBRARIES}
+	${QT_LIBRARIES} 
 )
 
-#include files
 INCLUDE_DIRECTORIES(${INCLUDE_DIRS})
 
-# Add binary called "databaseViewer" that is built from the source file "main.cpp".
-# The extension is automatically found.
 ADD_EXECUTABLE(databaseViewer WIN32 ${SRC_FILES})
 TARGET_LINK_LIBRARIES(databaseViewer rtabmap_corelib rtabmap_guilib ${LIBRARIES})
 
@@ -34,3 +30,4 @@ INSTALL(TARGETS databaseViewer
         RUNTIME DESTINATION bin COMPONENT runtime
         LIBRARY DESTINATION lib COMPONENT devel
         ARCHIVE DESTINATION lib COMPONENT devel)
+