Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
0421da78
Commit
0421da78
authored
Sep 09, 2014
by
Igor Kuzmin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
XIMEA cam support: allow on OS X too
parent
b027a84f
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
1 deletion
+9
-1
CMakeLists.txt
CMakeLists.txt
+1
-1
OpenCVFindXimea.cmake
cmake/OpenCVFindXimea.cmake
+6
-0
CMakeLists.txt
modules/highgui/CMakeLists.txt
+2
-0
No files found.
CMakeLists.txt
View file @
0421da78
...
...
@@ -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
)
)
...
...
cmake/OpenCVFindXimea.cmake
View file @
0421da78
...
...
@@ -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
)
...
...
modules/highgui/CMakeLists.txt
View file @
0421da78
...
...
@@ -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
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment