merged master to devel

This commit is contained in:
matlabbe
2016-06-23 15:44:24 -04:00
3 changed files with 96 additions and 23 deletions

View File

@@ -264,7 +264,7 @@ IF(WITH_ZED)
LINK_DIRECTORIES( ${LINK_DIRECTORIES} ${ZED_LIBRARY_DIR})
ENDIF(ZED_LIBRARIES AND ZED_INCLUDE_DIRS)
ELSE() # Linux
find_package(ZED 0.9 QUIET)
find_package(ZED 1 QUIET)
ENDIF(WIN32)
IF(ZED_FOUND)