mirror of
https://github.com/introlab/rtabmap.git
synced 2026-09-02 01:20:25 +08:00
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:
@@ -75,7 +75,11 @@ ENDIF(CMAKE_COMPILER_IS_GNUCXX)
|
||||
IF(WIN32)
|
||||
SET(CMAKE_INCLUDE_PATH "${PROJECT_SOURCE_DIR}/3rdParty/include;${CMAKE_INCLUDE_PATH}")
|
||||
SET(CMAKE_LIBRARY_PATH "${PROJECT_SOURCE_DIR}/3rdParty/lib;${CMAKE_LIBRARY_PATH}")
|
||||
ENDIF(WIN32)
|
||||
ELSEIF(APPLE)
|
||||
# For Mac ports
|
||||
SET(CMAKE_INCLUDE_PATH "/opt/local/include;${CMAKE_INCLUDE_PATH}")
|
||||
SET(CMAKE_LIBRARY_PATH "/opt/local/lib;${CMAKE_LIBRARY_PATH}")
|
||||
ENDIF()
|
||||
|
||||
####### Build libraries as shared or static #######
|
||||
OPTION(BUILD_SHARED_LIBS "Set to OFF to build static libraries" ON)
|
||||
@@ -108,6 +112,8 @@ SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_SOURCE_DIR}/lib)
|
||||
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 CppUnit is here, the test will be built
|
||||
@@ -176,7 +182,7 @@ INCLUDE(InstallRequiredSystemLibraries)
|
||||
|
||||
SET(CPACK_PACKAGE_NAME "${PROJECT_NAME}")
|
||||
SET(CPACK_PACKAGE_VENDOR "${PROJECT_NAME} project")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CTAB-MAP is a Real-Time Appearance-Based Mapping approach.")
|
||||
SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "RTAB-MAP is a Real-Time Appearance-Based Mapping approach.")
|
||||
#SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_SOURCE_DIR}/Description.txt")
|
||||
#SET(CPACK_RESOURCE_FILE_README "${CMAKE_SOURCE_DIR}/README.txt")
|
||||
SET(CPACK_PACKAGE_VERSION_MAJOR "${PROJECT_VERSION_MAJOR}")
|
||||
|
||||
Reference in New Issue
Block a user