Commit 691fb1ff authored by Marian Zajko's avatar Marian Zajko

XIMEA adapter update

- replaced m3api/m3apiX64 binaries with latest xiapi32/xiapi64 to
support latest camera models
- added new parameter definitions to videoio_c.h and
SetProperty/GetProperty calls
- added acquisition resetting for specific parmateters in SetProperty
call
- added new error return value evaluators
parent b3ac2746
...@@ -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)
......
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