generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

XIMEA cam support: allow on OS X too

Browse Source
This commit is contained in:
Igor Kuzmin 2014-09-09 19:17:13 +04:00
parent b027a84fa1
commit 0421da78b3
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CMakeLists.txt
View File

@ -159,7 +159,7 @@ OCV_OPTION(WITH_V4L "Include Video 4 Linux support" ON
OCV_OPTION(WITH_LIBV4L "Use libv4l for Video 4 Linux support" ON IF (UNIX AND NOT ANDROID) )
OCV_OPTION(WITH_DSHOW "Build HighGUI with DirectShow support" ON IF (WIN32 AND NOT ARM) )
OCV_OPTION(WITH_MSMF "Build HighGUI with Media Foundation support" OFF IF WIN32 )
OCV_OPTION(WITH_XIMEA "Include XIMEA cameras support" OFF IF (NOT ANDROID AND NOT APPLE) )
OCV_OPTION(WITH_XIMEA "Include XIMEA cameras support" OFF IF (NOT ANDROID) )
OCV_OPTION(WITH_XINE "Include Xine support (GPL)" OFF IF (UNIX AND NOT APPLE AND NOT ANDROID) )
OCV_OPTION(WITH_OPENCL "Include OpenCL Runtime support" ON IF (NOT IOS) )
OCV_OPTION(WITH_OPENCLAMDFFT "Include AMD OpenCL FFT library support" ON IF (NOT ANDROID AND NOT IOS) )

6
cmake/OpenCVFindXimea.cmake
View File

@ -31,6 +31,12 @@ if(WIN32)
else()
set(XIMEA_FOUND 0)
endif()
elseif(APPLE)
if(EXISTS /Library/Frameworks/m3api.framework)
set(XIMEA_FOUND 1)
else()
set(XIMEA_FOUND 0)
endif()
else()
if(EXISTS /opt/XIMEA)
set(XIMEA_FOUND 1)

2
modules/highgui/CMakeLists.txt
View File

@ -173,6 +173,8 @@ if(HAVE_XIMEA)
endif()
if(WIN32 AND X86_64)
list(APPEND HIGHGUI_LIBRARIES m3apiX64)
elseif(APPLE)
list(APPEND HIGHGUI_LIBRARIES "-framework m3api")
else()
list(APPEND HIGHGUI_LIBRARIES m3api)
endif()