Skip to content

O
opencv
Commit d4d1d034 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

Merge pull request #5635 from mzajko:xi_update

parents 9a66191e 1eb9ef6b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
modules/videoio/CMakeLists.txt
View file @ d4d1d034
...@@ -126,11 +126,11 @@ if(HAVE_XIMEA) ...@@ -126,11 +126,11 @@ if(HAVE_XIMEA)
link_directories("${XIMEA_LIBRARY_DIR}") link_directories("${XIMEA_LIBRARY_DIR}")
endif() endif()
if(WIN32 AND X86_64) if(WIN32 AND X86_64)
list(APPEND VIDEOIO_LIBRARIES m3apiX64) list(APPEND VIDEOIO_LIBRARIES xiapi64)
elseif(APPLE) elseif(APPLE)
list(APPEND VIDEOIO_LIBRARIES "-framework m3api") list(APPEND VIDEOIO_LIBRARIES "-framework m3api")
else() else()
list(APPEND VIDEOIO_LIBRARIES m3api) list(APPEND VIDEOIO_LIBRARIES xiapi32)
endif() endif()
endif(HAVE_XIMEA) endif(HAVE_XIMEA)
......
modules/videoio/src/cap_ximea.cpp
View file @ d4d1d034
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment