i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-03 16:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

MAC OS X binaries fixed bundle. Freenect underscore vs dashed includes

Browse Source 
git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1394 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-06-17 01:45:52 +00:00
parent 863caab3cd
commit 586f4e3d86
7 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake_modules/FindFreenect.cmake
+9 -2
View File
@@ -5,12 +5,19 @@
# Freenect_FOUND - Set to false, or undefined, if Freenect isn't found.
# Freenect_INCLUDE_DIRS - The Freenect include directory.
# Freenect_LIBRARIES - The Freenect library to link against.
# Freenect_DASH_INCLUDES - If includes have "-" instead of "_" in their names. New libfreenect has "_".
FIND_PATH(Freenect_INCLUDE_DIRS libfreenect-registration.h PATH_SUFFIXES libfreenect)
FIND_PATH(Freenect_INCLUDE_DIRS libfreenect-registration.h libfreenect_registration.h PATH_SUFFIXES libfreenect)
FIND_LIBRARY(Freenect_LIBRARY NAMES freenect)
FIND_LIBRARY(Freenect_sync_LIBRARY NAMES freenect_sync)
FIND_FILE(tmp libfreenect-registration.h PATH_SUFFIXES libfreenect)
SET(Freenect_DASH_INCLUDES 0)
IF(tmp)
SET(Freenect_DASH_INCLUDES 1)
ENDIF(tmp)
IF (Freenect_INCLUDE_DIRS AND Freenect_LIBRARY AND Freenect_sync_LIBRARY)
SET(Freenect_FOUND TRUE)
ENDIF (Freenect_INCLUDE_DIRS AND Freenect_LIBRARY AND Freenect_sync_LIBRARY)
@@ -19,7 +26,7 @@ IF (Freenect_FOUND)
# show which Freenect was found only if not quiet
SET(Freenect_LIBRARIES ${Freenect_LIBRARY} ${Freenect_sync_LIBRARY})
IF (NOT Freenect_FIND_QUIETLY)
MESSAGE(STATUS "Found Freenect")
MESSAGE(STATUS "Found Freenect: ${Freenect_LIBRARIES}")
ENDIF (NOT Freenect_FIND_QUIETLY)
ELSE (Freenect_FOUND)
# fatal error if Freenect is required but not found
cmake_modules/FindOpenNI2.cmake
+4 -3
View File
@@ -4,11 +4,12 @@
# It sets the following variables:
# OpenNI2_FOUND - Set to false, or undefined, if OpenNI2 isn't found.
# OpenNI2_INCLUDE_DIRS - The OpenNI2 include directory.
# OpenNI2_LIBRARIES - The OpenNI2 library to link against.
# OpenNI2_LIBRARIES - The OpenNI2 libraries to link against.
# OpenNI2_LIBRARY - The OpenNI2 library alone.
FIND_PATH(OpenNI2_INCLUDE_DIRS OpenNI.h HINTS $ENV{OPENNI2_INCLUDE64} $ENV{OPENNI2_INCLUDE} PATH_SUFFIXES openni2)
FIND_LIBRARY(OpenNI2_LIBRARY NAMES OpenNI2 HINTS $ENV{OPENNI2_LIB64} $ENV{OPENNI2_LIB})
FIND_LIBRARY(OpenNI2_LIBRARY NAMES OpenNI2 HINTS $ENV{OPENNI2_LIB64} $ENV{OPENNI2_LIB} $ENV{OPENNI2_REDIST})
IF (OpenNI2_INCLUDE_DIRS AND OpenNI2_LIBRARY)
SET(OpenNI2_FOUND TRUE)
@@ -18,7 +19,7 @@ IF (OpenNI2_FOUND)
# show which OpenNI2 was found only if not quiet
SET(OpenNI2_LIBRARIES ${OpenNI2_LIBRARY})
IF (NOT OpenNI2_FIND_QUIETLY)
MESSAGE(STATUS "Found OpenNI2")
MESSAGE(STATUS "Found OpenNI2: ${OpenNI2_LIBRARIES}")
ENDIF (NOT OpenNI2_FIND_QUIETLY)
ELSE (OpenNI2_FOUND)
# fatal error if OpenNI2 is required but not found