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 7981 additions and 94889 deletions
-30
View File
@@ -1,30 +0,0 @@
# - Find CppUnit
# This module finds an installed CppUnit package.
#
# It sets the following variables:
# CPPUNIT_FOUND - Set to false, or undefined, if CppUnit isn't found.
# CPPUNIT_INCLUDE_DIR - The CppUnit include directory.
# CPPUNIT_LIBRARY - The CppUnit library to link against.
# CPPUNIT_DEFINITIONS - The CppUnit definitions.
FIND_PATH(CPPUNIT_INCLUDE_DIR cppunit/Test.h)
FIND_LIBRARY(CPPUNIT_LIBRARY NAMES cppunit_dll cppunit)
IF (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
SET(CPPUNIT_FOUND TRUE)
SET(CPPUNIT_DEFINITIONS "-DCPPUNIT_DLL")
ENDIF (CPPUNIT_INCLUDE_DIR AND CPPUNIT_LIBRARY)
IF (CPPUNIT_FOUND)
# show which CppUnit was found only if not quiet
IF (NOT CppUnit_FIND_QUIETLY)
MESSAGE(STATUS "Found CppUnit")
ENDIF (NOT CppUnit_FIND_QUIETLY)
ELSE (CPPUNIT_FOUND)
# fatal error if CppUnit is required but not found
IF (CppUnit_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find CppUnit")
ENDIF (CppUnit_FIND_REQUIRED)
ENDIF (CPPUNIT_FOUND)
-34
View File
@@ -1,34 +0,0 @@
# - Find FFTW3F
# This module finds an installed FFTW3F package.
#
# It sets the following variables:
# FFTW3F_FOUND - Set to false, or undefined, if FFTW3F isn't found.
# FFTW3F_INCLUDE_DIRS - The FFTW3F include directory.
# FFTW3F_LIBRARIES - The FFTW3F library to link against.
#
#
FIND_PATH(FFTW3F_INCLUDE_DIRS
fftw3.h
PATH_SUFFIXES fftw3)
FIND_LIBRARY(FFTW3F_LIBRARIES NAMES fftw3f-3 fftw3f libfftw3f-3)
IF (FFTW3F_INCLUDE_DIRS AND FFTW3F_LIBRARIES)
SET(FFTW3F_FOUND TRUE)
ENDIF (FFTW3F_INCLUDE_DIRS AND FFTW3F_LIBRARIES)
IF (FFTW3F_FOUND)
# show which FFTW3F was found only if not quiet
IF (NOT FFTW3F_FIND_QUIETLY)
MESSAGE(STATUS "Found FFTW3F: ${FFTW3F_LIBRARIES}")
ENDIF (NOT FFTW3F_FIND_QUIETLY)
ELSE (FFTW3F_FOUND)
# fatal error if FFTW3F is required but not found
IF (FFTW3F_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find FFTW3F")
ENDIF (FFTW3F_FIND_REQUIRED)
ENDIF (FFTW3F_FOUND)
-98
View File
@@ -1,98 +0,0 @@
# - Find the Pthreads library
# This module searches for the Pthreads library (including the
# pthreads-win32 port).
#
# This module defines these variables:
#
# PTHREADS_FOUND
# True if the Pthreads library was found
# PTHREADS_LIBRARY
# The location of the Pthreads library
# PTHREADS_INCLUDE_DIR
# The include path of the Pthreads library
# PTHREADS_DEFINITIONS
# Preprocessor definitions to define
#
# This module responds to the PTHREADS_EXCEPTION_SCHEME
# variable on Win32 to allow the user to control the
# library linked against. The Pthreads-win32 port
# provides the ability to link against a version of the
# library with exception handling. IT IS NOT RECOMMENDED
# THAT YOU USE THIS because most POSIX thread implementations
# do not support stack unwinding.
#
# PTHREADS_EXCEPTION_SCHEME
# C = no exceptions (default)
# (NOTE: This is the default scheme on most POSIX thread
# implementations and what you should probably be using)
# CE = C++ Exception Handling
# SE = Structure Exception Handling (MSVC only)
#
#
# Define a default exception scheme to link against
# and validate user choice.
#
IF(NOT DEFINED PTHREADS_EXCEPTION_SCHEME)
# Assign default if needed
SET(PTHREADS_EXCEPTION_SCHEME "C")
ELSE(NOT DEFINED PTHREADS_EXCEPTION_SCHEME)
# Validate
IF(NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "C" AND
NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "CE" AND
NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
MESSAGE(FATAL_ERROR "See documentation for FindPthreads.cmake, only C, CE, and SE modes are allowed")
ENDIF(NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "C" AND
NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "CE" AND
NOT PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
IF(NOT MSVC AND PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
MESSAGE(FATAL_ERROR "Structured Exception Handling is only allowed for MSVC")
ENDIF(NOT MSVC AND PTHREADS_EXCEPTION_SCHEME STREQUAL "SE")
ENDIF(NOT DEFINED PTHREADS_EXCEPTION_SCHEME)
#
# Find the header file
#
FIND_PATH(PTHREADS_INCLUDE_DIR pthread.h)
#
# Find the library
#
SET(names)
IF(MSVC)
SET(names
pthreadV${PTHREADS_EXCEPTION_SCHEME}2
pthread
)
ELSEIF(MINGW)
SET(names
pthreadG${PTHREADS_EXCEPTION_SCHEME}2
pthread
)
ELSE(MSVC) # Unix / Cygwin / Apple
SET(names pthread)
ENDIF(MSVC)
FIND_LIBRARY(PTHREADS_LIBRARY ${names}
DOC "The Portable Threads Library")
IF(PTHREADS_INCLUDE_DIR AND PTHREADS_LIBRARY)
SET(PTHREADS_FOUND true)
SET(PTHREADS_DEFINITIONS -DHAVE_PTHREAD_H)
SET(PTHREADS_INCLUDE_DIRS ${PTHREADS_INCLUDE_DIR})
SET(PTHREADS_LIBRARIES ${PTHREADS_LIBRARY})
ENDIF(PTHREADS_INCLUDE_DIR AND PTHREADS_LIBRARY)
IF(PTHREADS_FOUND)
IF(NOT PTHREADS_FIND_QUIETLY)
MESSAGE(STATUS "Found Pthreads: ${PTHREADS_LIBRARY}")
ENDIF(NOT PTHREADS_FIND_QUIETLY)
ELSE(PTHREADS_FOUND)
IF(PTHREADS_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find the Pthreads Library")
ENDIF(PTHREADS_FIND_REQUIRED)
ENDIF(PTHREADS_FOUND)
-25
View File
@@ -1,25 +0,0 @@
# - Find ROS
# This module finds an installed ROS package.
#
# It sets the following variables:
# ROS_FOUND - Set to false, or undefined, if ROS isn't found.
IF(UNIX)
FIND_PROGRAM(ROS_EXEC NAME rosrun PATHS)
IF(ROS_EXEC)
SET(ROS_FOUND TRUE)
ENDIF(ROS_EXEC)
ENDIF(UNIX)
IF (ROS_FOUND)
# show which ROS was found only if not quiet
IF (NOT ROS_FIND_QUIETLY)
MESSAGE(STATUS "Found ROS")
ENDIF (NOT ROS_FIND_QUIETLY)
ELSE (ROS_FOUND)
# fatal error if ROS is required but not found
IF (ROS_FIND_REQUIRED)
MESSAGE(FATAL_ERROR "Could not find ROS")
ENDIF (ROS_FIND_REQUIRED)
ENDIF (ROS_FOUND)
+5 -5
View File
@@ -16,16 +16,16 @@ IF(UNIX)
OUTPUT_VARIABLE SQLITE3_VERSION
OUTPUT_STRIP_TRAILING_WHITESPACE
WORKING_DIRECTORY "./"
)
IF(SQLITE3_VERSION VERSION_LESS SQLITE3_VERSION_REQUIRED)
MESSAGE(FATAL_ERROR "Sqlite ${SQLITE3_VERSION} found, but version ${SQLITE3_VERSION_REQUIRED} minimum is required")
)
IF(SQLITE3_VERSION VERSION_LESS SQLITE3_VERSION_REQUIRED)
MESSAGE(FATAL_ERROR "Sqlite ${SQLITE3_VERSION} found, but version ${SQLITE3_VERSION_REQUIRED} minimum is required")
ENDIF(SQLITE3_VERSION VERSION_LESS SQLITE3_VERSION_REQUIRED)
ELSE(SQLITE3_EXEC)
MESSAGE(FATAL_ERROR "Could not find Sqlite3 executable")
ENDIF(SQLITE3_EXEC)
ENDIF(SQLITE3_EXEC)
ENDIF(UNIX)
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h PATH_SUFFIXES sqlite3)
FIND_PATH(SQLITE3_INCLUDE_DIR sqlite3.h)
FIND_LIBRARY(SQLITE3_LIBRARY NAMES sqlite3.dll sqlite3)
+19 -1
View File
@@ -16,7 +16,7 @@
#
#
SET(UtiLite_VERSION_REQUIRED 0.2.14)
SET(UtiLite_VERSION_REQUIRED 0.3.0)
SET(UtiLite_ROOT)
@@ -65,6 +65,12 @@ IF(URESOURCEGENERATOR_EXEC)
FIND_LIBRARY(UtiLite_Audio
NAMES utilite_audio
PATH_SUFFIXES "../lib")
FIND_LIBRARY(UtiLite_Cv
NAMES utilite_cv
PATH_SUFFIXES "../lib")
FIND_LIBRARY(UtiLite_Cvqt
NAMES utilite_cvqt
PATH_SUFFIXES "../lib")
ELSE()
FIND_PATH(UtiLite_INCLUDE_DIRS
@@ -80,6 +86,12 @@ IF(URESOURCEGENERATOR_EXEC)
FIND_LIBRARY(UtiLite_Audio
NAMES utilite_audio
PATHS ${UtiLite_ROOT}/lib)
FIND_LIBRARY(UtiLite_Cv
NAMES utilite_cv
PATHS ${UtiLite_ROOT}/lib)
FIND_LIBRARY(UtiLite_Cvqt
NAMES utilite_cvqt
PATHS ${UtiLite_ROOT}/lib)
ENDIF()
IF(UtiLite_LIBRARIES AND UtiLite_Qt)
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Qt})
@@ -87,6 +99,12 @@ IF(URESOURCEGENERATOR_EXEC)
IF(UtiLite_LIBRARIES AND UtiLite_Audio)
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Audio})
ENDIF(UtiLite_LIBRARIES AND UtiLite_Audio)
IF(UtiLite_LIBRARIES AND UtiLite_Cv)
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Cv})
ENDIF(UtiLite_LIBRARIES AND UtiLite_Audio)
IF(UtiLite_LIBRARIES AND UtiLite_Cvqt)
SET(UtiLite_LIBRARIES ${UtiLite_LIBRARIES} ${UtiLite_Cvqt})
ENDIF(UtiLite_LIBRARIES AND UtiLite_Audio)
IF (UtiLite_INCLUDE_DIRS AND UtiLite_LIBRARIES)
SET(UtiLite_FOUND TRUE)