merged attention branch to trunk

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@657 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2012-12-11 18:05:05 +00:00
parent f9033809a2
commit 2836d4c48c
216 changed files with 7983 additions and 94891 deletions

View File

@@ -14,7 +14,7 @@ SET(CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake_modules")
#######################
# VERSION
#######################
SET(PROJECT_VERSION "0.4.1")
SET(PROJECT_VERSION "0.5.0")
STRING(REGEX MATCHALL "[0-9]" PROJECT_VERSION_PARTS "${PROJECT_VERSION}")
@@ -111,27 +111,19 @@ SET(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/bin)
SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
####### BUILD OPTIONS #######
OPTION(BUILD_TESTS "Set to ON to build tests" OFF)
OPTION(BUILD_LIBS_ONLY "Set to ON to build only the libraries" OFF)
IF(APPLE AND BUILD_AS_BUNDLE)
IF(APPLE)
OPTION(BUILD_AS_BUNDLE "Set to ON to build as bundle (DragNDrop)" OFF)
ENDIF(APPLE AND BUILD_AS_BUNDLE)
ENDIF(APPLE)
####### DEPENDENCIES #######
FIND_PACKAGE(UtiLite REQUIRED)
FIND_PACKAGE(OpenCV REQUIRED)
FIND_PACKAGE(Sqlite3 REQUIRED)
FIND_PACKAGE(FFTW3F REQUIRED)
FIND_PACKAGE(ZLIB REQUIRED)
# If Qt is here, the GUI will be built
FIND_PACKAGE(Qt4 COMPONENTS QtCore QtGui QtSvg)
IF(BUILD_TESTS)
# If CppUnit is here, the tests will be built
FIND_PACKAGE(CppUnit REQUIRED)
ENDIF(BUILD_TESTS)
####### OSX BUNDLE CMAKE_INSTALL_PREFIX #######
IF(APPLE AND BUILD_AS_BUNDLE)
IF(QT4_FOUND AND QT_QTCORE_FOUND AND QT_QTGUI_FOUND)
@@ -149,6 +141,7 @@ IF(APPLE AND BUILD_AS_BUNDLE)
ENDIF(BUILD_LIBS_ONLY)
# Required when packaging, and set CMAKE_INSTALL_PREFIX to "/".
SET(CMAKE_INSTALL_PREFIX "/")
SET(CPACK_SET_DESTDIR TRUE)
SET(CMAKE_BUNDLE_NAME
@@ -188,10 +181,6 @@ IF(NOT BUILD_LIBS_ONLY)
ADD_SUBDIRECTORY( tools )
ENDIF(NOT BUILD_LIBS_ONLY)
IF(BUILD_TESTS)
ADD_SUBDIRECTORY( tests )
ENDIF(BUILD_TESTS)
#######################
# Uninstall target, for "make uninstall"
#######################
@@ -305,7 +294,6 @@ IF(NOT WIN32)
MESSAGE(STATUS " BUILD_SHARED_LIBS = ${BUILD_SHARED_LIBS}")
ENDIF(NOT WIN32)
MESSAGE(STATUS " BUILD_LIBS_ONLY = ${BUILD_LIBS_ONLY}")
MESSAGE(STATUS " BUILD_TESTS = ${BUILD_TESTS}")
IF(APPLE)
MESSAGE(STATUS " BUILD_AS_BUNDLE = ${BUILD_AS_BUNDLE}")
ENDIF(APPLE)