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
34c006fc
Commit
34c006fc
authored
Jan 25, 2016
by
Marian Zajko
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed ximea cmake settings
Fixed ximea cmake settings for 32bit win build and linux.
parent
1cd3c6f3
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletion
+3
-1
CMakeLists.txt
modules/videoio/CMakeLists.txt
+3
-1
No files found.
modules/videoio/CMakeLists.txt
View file @
34c006fc
...
@@ -131,10 +131,12 @@ if(HAVE_XIMEA)
...
@@ -131,10 +131,12 @@ if(HAVE_XIMEA)
endif
()
endif
()
if
(
WIN32 AND X86_64
)
if
(
WIN32 AND X86_64
)
list
(
APPEND VIDEOIO_LIBRARIES xiapi64
)
list
(
APPEND VIDEOIO_LIBRARIES xiapi64
)
elseif
(
WIN32
)
list
(
APPEND VIDEOIO_LIBRARIES xiapi32
)
elseif
(
APPLE
)
elseif
(
APPLE
)
list
(
APPEND VIDEOIO_LIBRARIES
"-framework m3api"
)
list
(
APPEND VIDEOIO_LIBRARIES
"-framework m3api"
)
else
()
else
()
list
(
APPEND VIDEOIO_LIBRARIES
xiapi32
)
list
(
APPEND VIDEOIO_LIBRARIES
m3api
)
endif
()
endif
()
endif
(
HAVE_XIMEA
)
endif
(
HAVE_XIMEA
)
...
...
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