diff -up ./mrpt-0.9.6/CMakeLists.txt.pcl16 ./mrpt-0.9.6/CMakeLists.txt
--- ./mrpt-0.9.6/CMakeLists.txt.pcl16 2012-05-29 18:24:03.000000000 -0400
+++ ./mrpt-0.9.6/CMakeLists.txt 2012-08-26 17:05:27.062081842 -0400
@@ -52,7 +52,7 @@ ENDIF(WIN32)
# ----------------------------------------------------------------------------
# The root directory for all MRPT libraries/modules:
# ----------------------------------------------------------------------------
-SET(MRPT_LIBS_ROOT "${CMAKE_SOURCE_DIR}/libs" CACHE INTERNAL "") # This emulates global vars
+SET(MRPT_LIBS_ROOT "${CMAKE_SOURCE_DIR}/lib64s" CACHE INTERNAL "") # This emulates global vars
LIST(APPEND CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmakemodules")
@@ -139,7 +139,7 @@ IF(WIN32)
# Install header and source files:
# ---------------------------------------------
- INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/libs/"
+ INSTALL(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/lib64s/"
DESTINATION libs
PATTERN ".svn" EXCLUDE
PATTERN "*~" EXCLUDE)
@@ -174,7 +174,7 @@ IF(WIN32)
SET(CPACK_NSIS_MENU_LINKS
- "doc;Documentation directory;bin;Directory of executables (bin);doc/chm/libMRPT-@CMAKE_MRPT_VERSION_NUMBER_MAJOR@.@CMAKE_MRPT_VERSION_NUMBER_MINOR@.@CMAKE_MRPT_VERSION_NUMBER_PATCH@.chm;MRPT libraries reference (CHM);README.txt;Read me;http://www.mrpt.org/;Online help;doc/mrpt-book.pdf;The MRPT book (PDF)")
+ "doc;Documentation directory;bin;Directory of executables (bin);doc/chm/lib64MRPT-@CMAKE_MRPT_VERSION_NUMBER_MAJOR@.@CMAKE_MRPT_VERSION_NUMBER_MINOR@.@CMAKE_MRPT_VERSION_NUMBER_PATCH@.chm;MRPT libraries reference (CHM);README.txt;Read me;http://www.mrpt.org/;Online help;doc/mrpt-book.pdf;The MRPT book (PDF)")
# File types association:
SET(CPACK_NSIS_DEFINES "
@@ -241,13 +241,13 @@ MARK_AS_ADVANCED(BUILD_STEREOSLAM )
# If some app is not in this package, do NOT build it:
# =====================================================
-IF (NOT EXISTS "${MRPT_SOURCE_DIR}/libs/monoslam/src")
+IF (NOT EXISTS "${MRPT_SOURCE_DIR}/lib64s/monoslam/src")
SET(BUILD_MONOSLAM OFF CACHE INTERNAL "" FORCE)
-ENDIF (NOT EXISTS "${MRPT_SOURCE_DIR}/libs/monoslam/src")
+ENDIF (NOT EXISTS "${MRPT_SOURCE_DIR}/lib64s/monoslam/src")
-IF (NOT EXISTS "${MRPT_SOURCE_DIR}/libs/stereoslam/src")
+IF (NOT EXISTS "${MRPT_SOURCE_DIR}/lib64s/stereoslam/src")
SET(BUILD_STEREOSLAM OFF CACHE INTERNAL "" FORCE)
-ENDIF (NOT EXISTS "${MRPT_SOURCE_DIR}/libs/stereoslam/src")
+ENDIF (NOT EXISTS "${MRPT_SOURCE_DIR}/lib64s/stereoslam/src")
# Build static or dynamic libs?
@@ -429,7 +429,7 @@ if (MRPT_HAS_TBB)
find_path(TBB_INCLUDE_DIR "tbb/tbb.h" PATHS ${TBB_DEFAULT_INCLUDE_DIRS} DOC "The path to TBB headers")
if (TBB_INCLUDE_DIR)
if (UNIX)
- set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory")
+ set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib64" CACHE PATH "Full path of TBB library directory")
link_directories("${TBB_LIB_DIR}")
endif(UNIX)
if (APPLE)
@@ -441,11 +441,11 @@ if (MRPT_HAS_TBB)
APPEND_MRPT_LIBS(tbb)
elseif (WIN32)
if (CMAKE_COMPILER_IS_GNUCXX)
- set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib" CACHE PATH "Full path of TBB library directory")
+ set(TBB_LIB_DIR "${TBB_INCLUDE_DIR}/../lib64" CACHE PATH "Full path of TBB library directory")
link_directories("${TBB_LIB_DIR}")
APPEND_MRPT_LIBS(tbb)
else(CMAKE_COMPILER_IS_GNUCXX)
- get_filename_component(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib" ABSOLUTE)
+ get_filename_component(_TBB_LIB_PATH "${TBB_INCLUDE_DIR}/../lib64" ABSOLUTE)
if(${CMAKE_SYSTEM_PROCESSOR} MATCHES amd64*|x86_64*)
set(_TBB_LIB_PATH "${_TBB_LIB_PATH}/intel64")
@@ -464,7 +464,7 @@ if (MRPT_HAS_TBB)
set(TBB_LIB_DIR "${_TBB_LIB_PATH}" CACHE PATH "Full path of TBB library directory")
link_directories("${TBB_LIB_DIR}")
endif(CMAKE_COMPILER_IS_GNUCXX)
- endif(UNIX)
+ endif(APPLE)
set(CMAKE_MRPT_HAS_TBB 1)
if(NOT "${TBB_INCLUDE_DIR}" STREQUAL "")
@@ -511,10 +511,10 @@ ELSE(UNIX)
MESSAGE("The directory 'BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR' does not contain include/PGRFlyCapture.h. Turn off BUMBLEBEE support or provide the correct path.")
ENDIF(NOT EXISTS ${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/include/PGRFlyCapture.h)
- IF(NOT EXISTS ${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/lib/PGRFlyCapture.lib)
+ IF(NOT EXISTS ${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/lib64/PGRFlyCapture.lib)
SET(CMAKE_MRPT_HAS_BUMBLEBEE 0)
MESSAGE("The directory 'BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR' does not contain lib/PGRFlyCapture.LIB. Turn off BUMBLEBEE support or provide the correct path.")
- ENDIF(NOT EXISTS ${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/lib/PGRFlyCapture.lib)
+ ENDIF(NOT EXISTS ${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/lib64/PGRFlyCapture.lib)
# ----
@@ -528,10 +528,10 @@ ELSE(UNIX)
MESSAGE("The directory 'BUMBLEBEE_TRICLOPS_ROOT_DIR' does not contain include/triclops.h. Turn off BUMBLEBEE support or provide the correct path.")
ENDIF(NOT EXISTS ${BUMBLEBEE_TRICLOPS_ROOT_DIR}/include/triclops.h)
- IF(NOT EXISTS ${BUMBLEBEE_TRICLOPS_ROOT_DIR}/lib/triclops.lib)
+ IF(NOT EXISTS ${BUMBLEBEE_TRICLOPS_ROOT_DIR}/lib64/triclops.lib)
SET(CMAKE_MRPT_HAS_BUMBLEBEE 0)
MESSAGE("The directory 'BUMBLEBEE_TRICLOPS_ROOT_DIR' does not contain lib/triclops.lib. Turn off BUMBLEBEE support or provide the correct path.")
- ENDIF(NOT EXISTS ${BUMBLEBEE_TRICLOPS_ROOT_DIR}/lib/triclops.lib)
+ ENDIF(NOT EXISTS ${BUMBLEBEE_TRICLOPS_ROOT_DIR}/lib64/triclops.lib)
ENDIF(UNIX)
ENDIF(MRPT_HAS_BUMBLEBEE)
@@ -543,15 +543,16 @@ SET( MRPT_HAS_PHIDGET OFF CACHE BOOL "Ad
IF(MRPT_HAS_PHIDGET)
SET(CMAKE_MRPT_HAS_PHIDGET 1)
SET(PHIDGET_ROOT_DIR "/usr/local" CACHE PATH "Path where libPhidget21 was installed, if phidget21.h is in /usr/local/include, set this variable to /usr/local.")
+ SET(PHIDGET_LIB_DIR "${PHIDGET_ROOT_DIR}/lib" CACHE PATH "Path to libPhidget21 shared libraries")
IF(UNIX)
IF(NOT EXISTS ${PHIDGET_ROOT_DIR}/include/phidget21.h)
SET(CMAKE_MRPT_HAS_PHIDGET 0)
MESSAGE("Can't find incude file phidget21.h, please set a correct PHIDGET_ROOT_DIR")
ENDIF(NOT EXISTS ${PHIDGET_ROOT_DIR}/include/phidget21.h)
- IF(NOT EXISTS ${PHIDGET_ROOT_DIR}/lib/libphidget21.so)
+ IF(NOT EXISTS ${PHIDGET_LIB_DIR}/libphidget21.so)
SET(CMAKE_MRPT_HAS_PHIDGET 0)
MESSAGE("Can't find incude file libphidget21.so, please set a correct PHIDGET_ROOT_DIR")
- ENDIF(NOT EXISTS ${PHIDGET_ROOT_DIR}/lib/libphidget21.so)
+ ENDIF(NOT EXISTS ${PHIDGET_LIB_DIR}/libphidget21.so)
ELSE(UNIX)
SET(CMAKE_MRPT_HAS_PHIDGET 0)
MESSAGE("The MRPT Phidget library interface is only supported on linux, please turn off MRPT_HAS_PHIDGET")
@@ -815,17 +816,17 @@ IF(PKG_CONFIG_FOUND)
INCLUDE_DIRECTORIES("${LIBAVCODEC_INCLUDEDIR}/")
INCLUDE_DIRECTORIES("${LIBAVCODEC_INCLUDEDIR}/ffmpeg")
- INCLUDE_DIRECTORIES("${LIBAVCODEC_INCLUDEDIR}/libavcodec")
+ INCLUDE_DIRECTORIES("${LIBAVCODEC_INCLUDEDIR}/lib64avcodec")
INCLUDE_DIRECTORIES("${LIBAVUTIL_INCLUDEDIR}")
INCLUDE_DIRECTORIES("${LIBAVFORMAT_INCLUDEDIR}")
INCLUDE_DIRECTORIES("${LIBAVFORMAT_INCLUDEDIR}/ffmpeg")
- INCLUDE_DIRECTORIES("${LIBAVFORMAT_INCLUDEDIR}/libavformat")
+ INCLUDE_DIRECTORIES("${LIBAVFORMAT_INCLUDEDIR}/lib64avformat")
INCLUDE_DIRECTORIES("${LIBSWSCALE_INCLUDEDIR}")
INCLUDE_DIRECTORIES("${LIBSWSCALE_INCLUDEDIR}/ffmpeg")
- INCLUDE_DIRECTORIES("${LIBSWSCALE_INCLUDEDIR}/libswscale")
+ INCLUDE_DIRECTORIES("${LIBSWSCALE_INCLUDEDIR}/lib64swscale")
LINK_DIRECTORIES("${LIBAVCODEC_LIBDIR}")
LINK_DIRECTORIES("${LIBAVUTIL_LIBDIR}")
@@ -857,53 +858,53 @@ IF(MRPT_HAS_FFMPEG_WIN32)
MESSAGE("The directory 'FFMPEG_WIN32_ROOT_DIR' does not exists. Turn off FFmpeg support or provide the correct path.")
ENDIF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}")
- IF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavcodec" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavformat" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavutil" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libswscale")
+ IF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/lib64avcodec" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavformat" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavutil" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libswscale")
SET(CMAKE_MRPT_HAS_FFMPEG 0)
SET(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
MESSAGE("The directory 'FFMPEG_WIN32_ROOT_DIR' does not contain include/{libavcodec,libavformat,libavutil,libswscale}. Turn off FFmpeg support or provide the correct path.")
- ENDIF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavcodec" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavformat" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavutil" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libswscale")
+ ENDIF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/lib64avcodec" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavformat" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libavutil" OR NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/include/libswscale")
- IF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/lib")
+ IF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/lib64")
SET(CMAKE_MRPT_HAS_FFMPEG 0)
SET(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
- MESSAGE("The directory 'FFMPEG_WIN32_ROOT_DIR' does not contain /lib/. Turn off FFmpeg support or provide the correct path.")
- ENDIF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/lib")
+ MESSAGE("The directory 'FFMPEG_WIN32_ROOT_DIR' does not contain /lib64/. Turn off FFmpeg support or provide the correct path.")
+ ENDIF(NOT EXISTS "${FFMPEG_WIN32_ROOT_DIR}/lib64")
# We need the .lib files: avcodec-52.lib, avformat-52.lib, avutil-49.lib, swscale-0.lib
- FILE(GLOB FFMPEG_WIN32_AVCODEC_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib/avcodec*.lib")
- FILE(GLOB FFMPEG_WIN32_AVUTIL_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib/avutil*.lib")
- FILE(GLOB FFMPEG_WIN32_AVFORMAT_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib/avformat*.lib")
- FILE(GLOB FFMPEG_WIN32_SWSCALE_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib/swscale*.lib")
+ FILE(GLOB FFMPEG_WIN32_AVCODEC_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib64/avcodec*.lib")
+ FILE(GLOB FFMPEG_WIN32_AVUTIL_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib64/avutil*.lib")
+ FILE(GLOB FFMPEG_WIN32_AVFORMAT_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib64/avformat*.lib")
+ FILE(GLOB FFMPEG_WIN32_SWSCALE_LIB "${FFMPEG_WIN32_ROOT_DIR}/lib64/swscale*.lib")
IF (NOT EXISTS ${FFMPEG_WIN32_AVCODEC_LIB})
SET(CMAKE_MRPT_HAS_FFMPEG 0)
SET(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
- MESSAGE("avcodec-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib'. Turn off FFmpeg support or provide the correct path.")
+ MESSAGE("avcodec-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib64'. Turn off FFmpeg support or provide the correct path.")
ENDIF (NOT EXISTS ${FFMPEG_WIN32_AVCODEC_LIB})
IF (NOT EXISTS ${FFMPEG_WIN32_AVUTIL_LIB})
SET(CMAKE_MRPT_HAS_FFMPEG 0)
SET(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
- MESSAGE("avutil-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib'. Turn off FFmpeg support or provide the correct path.")
+ MESSAGE("avutil-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib64'. Turn off FFmpeg support or provide the correct path.")
ENDIF (NOT EXISTS ${FFMPEG_WIN32_AVUTIL_LIB})
IF (NOT EXISTS ${FFMPEG_WIN32_AVFORMAT_LIB})
SET(CMAKE_MRPT_HAS_FFMPEG 0)
SET(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
- MESSAGE("avformat-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib'. Turn off FFmpeg support or provide the correct path.")
+ MESSAGE("avformat-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib64'. Turn off FFmpeg support or provide the correct path.")
ENDIF (NOT EXISTS ${FFMPEG_WIN32_AVFORMAT_LIB})
IF (NOT EXISTS ${FFMPEG_WIN32_SWSCALE_LIB})
SET(CMAKE_MRPT_HAS_FFMPEG 0)
SET(CMAKE_MRPT_HAS_FFMPEG_SYSTEM 0)
- MESSAGE("swscale-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib'. Turn off FFmpeg support or provide the correct path.")
+ MESSAGE("swscale-XX.lib not found under '${FFMPEG_WIN32_ROOT_DIR}/lib64'. Turn off FFmpeg support or provide the correct path.")
ENDIF (NOT EXISTS ${FFMPEG_WIN32_SWSCALE_LIB})
INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include")
- INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/libavcodec")
- INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/libavformat")
- INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/libavutil")
- INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/libswscale")
+ INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/lib64avcodec")
+ INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/lib64avformat")
+ INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/lib64avutil")
+ INCLUDE_DIRECTORIES("${FFMPEG_WIN32_ROOT_DIR}/include/lib64swscale")
SET(MRPT_FFMPEG_LIBS_TO_LINK ${MRPT_FFMPEG_LIBS_TO_LINK} "${FFMPEG_WIN32_AVCODEC_LIB}" "${FFMPEG_WIN32_AVUTIL_LIB}" "${FFMPEG_WIN32_AVFORMAT_LIB}" "${FFMPEG_WIN32_SWSCALE_LIB}")
ENDIF(MRPT_HAS_FFMPEG_WIN32)
@@ -941,9 +942,9 @@ ENDIF(UNIX)
# Make things easier: If we are building for MSVC, select the vc_lib or vc_dll directory automatically:
if(msvc)
if(BUILD_SHARED_LIBS)
- set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib/vc_dll" FORCE)
+ set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib64/vc_dll" FORCE)
else(BUILD_SHARED_LIBS)
- set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib/vc_lib" FORCE)
+ set(wxWidgets_LIB_DIR "${wxWidgets_ROOT_DIR}/lib64/vc_lib" FORCE)
endif(BUILD_SHARED_LIBS)
endif(msvc)
@@ -1283,23 +1284,23 @@ IF(UNIX)
ELSE(UNIX)
IF (MSVC)
# Windows: ...
- FIND_PATH(SWR_LIBMESASR_DIR MesaImaging/Swissranger/libMesaSR/)
+ FIND_PATH(SWR_LIBMESASR_DIR MesaImaging/Swissranger/lib64MesaSR/)
IF(SWR_LIBMESASR_DIR)
- SET(SWR_LIBMESASR_DIR "${SWR_LIBMESASR_DIR}/MesaImaging/Swissranger/libMesaSR/")
+ SET(SWR_LIBMESASR_DIR "${SWR_LIBMESASR_DIR}/MesaImaging/Swissranger/lib64MesaSR/")
MESSAGE(STATUS "SwissRanger Library found in: ${SWR_LIBMESASR_DIR}")
# We expect to find there "libMesaSR.lib" & "libMesaSR.h"
- IF (EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.lib" AND EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.h")
+ IF (EXISTS "${SWR_LIBMESASR_DIR}/lib64MesaSR.lib" AND EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.h")
SET(CMAKE_MRPT_HAS_SWISSRANGE 1)
INCLUDE_DIRECTORIES("${SWR_LIBMESASR_DIR}")
#LINK_DIRECTORIES("${SWR_LIBMESASR_DIR}")
- APPEND_MRPT_LIBS("${SWR_LIBMESASR_DIR}/libMesaSR.lib")
+ APPEND_MRPT_LIBS("${SWR_LIBMESASR_DIR}/lib64MesaSR.lib")
MARK_AS_ADVANCED(SWR_LIBMESASR_DIR)
- ELSE (EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.lib" AND EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.h")
+ ELSE (EXISTS "${SWR_LIBMESASR_DIR}/lib64MesaSR.lib" AND EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.h")
MESSAGE(STATUS "*** ERROR *** SwissRanger Library directory found but doesn't contain expected files. Not using it.")
SET(CMAKE_MRPT_HAS_SWISSRANGE 0)
- ENDIF (EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.lib" AND EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.h")
+ ENDIF (EXISTS "${SWR_LIBMESASR_DIR}/lib64MesaSR.lib" AND EXISTS "${SWR_LIBMESASR_DIR}/libMesaSR.h")
ELSE(SWR_LIBMESASR_DIR)
SET(CMAKE_MRPT_HAS_SWISSRANGE 0)
ENDIF(SWR_LIBMESASR_DIR)
@@ -1723,19 +1724,19 @@ CONFIGURE_FILE("${CMAKE_SOURCE_DIR}/pars
INCLUDE_DIRECTORIES(".")
INCLUDE_DIRECTORIES("${MRPT_CONFIG_FILE_INCLUDE_DIR}")
-LINK_DIRECTORIES("${CMAKE_BINARY_DIR}/lib")
+LINK_DIRECTORIES("${CMAKE_BINARY_DIR}/lib64")
IF(CMAKE_MRPT_HAS_BUMBLEBEE)
INCLUDE_DIRECTORIES("${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/include")
INCLUDE_DIRECTORIES("${BUMBLEBEE_TRICLOPS_ROOT_DIR}/include")
- LINK_DIRECTORIES("${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/lib")
- LINK_DIRECTORIES("${BUMBLEBEE_TRICLOPS_ROOT_DIR}/lib")
+ LINK_DIRECTORIES("${BUMBLEBEE_PGR_FLYCAPTURE_ROOT_DIR}/lib64")
+ LINK_DIRECTORIES("${BUMBLEBEE_TRICLOPS_ROOT_DIR}/lib64")
ENDIF(CMAKE_MRPT_HAS_BUMBLEBEE)
IF(CMAKE_MRPT_HAS_PHIDGET)
INCLUDE_DIRECTORIES("${PHIDGET_ROOT_DIR}/include/")
- LINK_DIRECTORIES("${PHIDGET_ROOT_DIR}/lib")
+ LINK_DIRECTORIES("${PHIDGET_ROOT_DIR}/lib64")
ENDIF(CMAKE_MRPT_HAS_PHIDGET)
IF(CMAKE_MRPT_HAS_SVS)
@@ -1897,7 +1898,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX)
# Parallel stdlibc++?
IF(MRPT_ENABLE_LIBSTD_PARALLEL_MODE)
- SET(EXTRA_CPP_FLAGS "${EXTRA_CPP_FLAGS} -D_GLIBCXX_PARALLEL -fopenmp")
+ SET(EXTRA_CPP_FLAGS "${EXTRA_CPP_FLAGS} -fopenmp")
ENDIF(MRPT_ENABLE_LIBSTD_PARALLEL_MODE)
IF(CMAKE_BUILD_TYPE MATCHES "Debug")
@@ -1964,13 +1965,13 @@ ENDIF($ENV{VERBOSE})
#MESSAGE(STATUS "CMAKE_CONFIGURATION_TYPES: ${CMAKE_CONFIGURATION_TYPES}")
# Save libs and executables in the same place
-SET( LIBRARY_OUTPUT_PATH ${MRPT_BINARY_DIR}/lib CACHE PATH "Output directory for libraries" )
+SET( LIBRARY_OUTPUT_PATH ${MRPT_BINARY_DIR}/lib64 CACHE PATH "Output directory for libraries" )
SET( EXECUTABLE_OUTPUT_PATH ${MRPT_BINARY_DIR}/bin CACHE PATH "Output directory for applications" )
#-----------------------------------
# Build the hardware drivers?
#-----------------------------------
-SET( BUILD_HWDRIVERS ON CACHE BOOL "Build hardware drivers (library apps/lib_hwdrivers)?.")
+SET( BUILD_HWDRIVERS ON CACHE BOOL "Build hardware drivers (library apps/lib64_hwdrivers)?.")
MARK_AS_ADVANCED(BUILD_HWDRIVERS)
@@ -1983,10 +1984,10 @@ IF(CMAKE_MRPT_USE_DEB_POSTFIXS)
MESSAGE(STATUS "** mrpt cmake: Using Debian post-fix for install directories **")
IF(CMAKE_BUILD_TYPE STREQUAL "Debug")
# Debug packages
- SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmrpt-dbg/usr/")
+ SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib64mrpt-dbg/usr/")
ELSE(CMAKE_BUILD_TYPE STREQUAL "Debug")
# Normal packages
- SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/libmrpt-dev/usr/")
+ SET(libmrpt_dev_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/lib64mrpt-dev/usr/")
ENDIF(CMAKE_BUILD_TYPE STREQUAL "Debug")
SET(mrpt_apps_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/mrpt-apps/usr/")
@@ -2067,7 +2068,7 @@ ENDFOREACH(_LIB)
# Generate the MRPTConfig.cmake file
# ----------------------------------------------------------------------------
SET(THE_MRPT_SOURCE_DIR "${MRPT_SOURCE_DIR}")
-SET(THE_MRPT_LIBS_INCL_DIR "${THE_MRPT_SOURCE_DIR}/libs")
+SET(THE_MRPT_LIBS_INCL_DIR "${THE_MRPT_SOURCE_DIR}/lib64s")
SET(THE_CMAKE_BINARY_DIR "${CMAKE_BINARY_DIR}")
SET(THE_MRPT_CONFIG_FILE_INCLUDE_DIR "${MRPT_CONFIG_FILE_INCLUDE_DIR}")
SET(MRPT_CONFIGFILE_IS_INSTALL 0)
@@ -2082,7 +2083,7 @@ CONFIGURE_FILE("${MRPT_SOURCE_DIR}/MRPTC
SET(MRPT_CONFIGFILE_IS_INSTALL 1)
IF(WIN32)
SET(THE_MRPT_SOURCE_DIR "\${THIS_MRPT_CONFIG_PATH}")
- SET(THE_MRPT_LIBS_INCL_DIR "${THE_MRPT_SOURCE_DIR}/libs")
+ SET(THE_MRPT_LIBS_INCL_DIR "${THE_MRPT_SOURCE_DIR}/lib64s")
SET(THE_CMAKE_BINARY_DIR "\${THIS_MRPT_CONFIG_PATH}")
SET(THE_MRPT_CONFIG_FILE_INCLUDE_DIR "\${THIS_MRPT_CONFIG_PATH}/include/mrpt/mrpt-config/")
ELSE(WIN32)
@@ -2242,7 +2243,7 @@ IF(WIN32)
# Intel TBB dlls
if(CMAKE_MRPT_HAS_TBB)
- string(REGEX REPLACE "/lib" "/bin" TBB_DLL_DIR "${TBB_LIB_DIR}")
+ string(REGEX REPLACE "/lib64" "/bin" TBB_DLL_DIR "${TBB_LIB_DIR}")
install(PROGRAMS "${TBB_DLL_DIR}/tbb.dll" DESTINATION bin COMPONENT main)
install(PROGRAMS "${TBB_DLL_DIR}/tbb_debug.dll" DESTINATION bin COMPONENT main)
endif(CMAKE_MRPT_HAS_TBB)
@@ -2258,7 +2259,7 @@ IF(WIN32)
# libfreenect for windows: Copy the libusb.dll file:
IF (NOT UNIX AND CMAKE_MRPT_HAS_FREENECT)
IF (NOT "${LIBUSB_1_DLL_FOR_INSTALL}" STREQUAL "")
- INSTALL(FILES "${LIBUSB_1_DLL_FOR_INSTALL}/libusb0.dll" DESTINATION bin)
+ INSTALL(FILES "${LIBUSB_1_DLL_FOR_INSTALL}/lib64usb0.dll" DESTINATION bin)
ENDIF (NOT "${LIBUSB_1_DLL_FOR_INSTALL}" STREQUAL "")
ENDIF (NOT UNIX AND CMAKE_MRPT_HAS_FREENECT)
@@ -2279,7 +2280,7 @@ IF(WIN32)
FOREACH(F ${EXTRA_DLLS})
INSTALL(FILES "${F}" DESTINATION bin)
ENDFOREACH(F)
- FILE(GLOB_RECURSE EXTRA_LIBS "${MRPT_BINARY_DIR}/lib/Debug/*.lib")
+ FILE(GLOB_RECURSE EXTRA_LIBS "${MRPT_BINARY_DIR}/lib64/Debug/*.lib")
FOREACH(F ${EXTRA_LIBS})
INSTALL(FILES "${F}" DESTINATION lib)
ENDFOREACH(F)
@@ -2305,11 +2306,11 @@ ELSE(WIN32)
ENDIF(WIN32)
# The headers of all the MRPT libs:
-# (in win32 the /libs/* tree is install entirely, not only the headers):
+# (in win32 the /lib64s/* tree is install entirely, not only the headers):
IF (UNIX AND NOT IS_DEBIAN_DBG_PKG)
FOREACH(_LIB ${ALL_MRPT_LIBS})
STRING(REGEX REPLACE "mrpt-(.*)" "\\1" _LIB ${_LIB})
- SET(SRC_DIR "${MRPT_SOURCE_DIR}/libs/${_LIB}/include/")
+ SET(SRC_DIR "${MRPT_SOURCE_DIR}/lib64s/${_LIB}/include/")
IF (EXISTS "${SRC_DIR}") # This is mainly to avoid a crash with "mrpt-core", which is a "virtual" MRPT module.
INSTALL(DIRECTORY "${SRC_DIR}" DESTINATION ${libmrpt_dev_INSTALL_PREFIX}include/mrpt/${_LIB}/include/ PATTERN ".svn" EXCLUDE)
ENDIF (EXISTS "${SRC_DIR}")
@@ -2326,7 +2327,7 @@ ENDIF(NOT IS_DEBIAN_DBG_PKG)
# If using embedded version, install embedded version as part of mrpt-base's headers:
IF (EIGEN_USE_EMBEDDED_VERSION AND NOT IS_DEBIAN_DBG_PKG)
IF(WIN32)
- # Eigen headers must end up in /Program Files/MRPT-X.Y.Z/libs/base/...
+ # Eigen headers must end up in /Program Files/MRPT-X.Y.Z/lib64s/base/...
SET(MRPT_INSTALL_EIGEN_PREFIX "libs/base/include/")
ELSE(WIN32)
# Eigen headers must end up in /usr/...
diff -up ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h.pcl16 ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h
--- ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h.pcl16 2012-01-07 13:47:43.000000000 -0500
+++ ./mrpt-0.9.6/libs/maps/include/mrpt/maps.h 2012-08-26 17:03:42.728112977 -0400
@@ -30,7 +30,7 @@
#define _mrpt_maps_H
#include <mrpt/config.h>
-
+#include <cerrno>
// Only really include all headers if we come from a user program (anything
// not defining mrpt_*_EXPORTS) or MRPT is being built with precompiled headers.
#if !defined(mrpt_maps_EXPORTS) || MRPT_ENABLE_PRECOMPILED_HDRS || defined(MRPT_ALWAYS_INCLUDE_ALL_HEADERS)
diff -up ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp.pcl16 ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp
--- ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp.pcl16 2012-01-07 13:47:43.000000000 -0500
+++ ./mrpt-0.9.6/libs/maps/src/maps/CBeaconMap.cpp 2012-08-26 17:03:42.729113015 -0400
@@ -27,7 +27,7 @@
+---------------------------------------------------------------------------+ */
#include <mrpt/maps.h> // Precompiled header
-
+#include <cerrno>
#include <mrpt/slam/CBeaconMap.h>