Merge pull request #5635 from mzajko:xi_update

d4d1d034 · Vadim Pisarevsky · 9a66191e · 1eb9ef6b · d4d1d034 · d4d1d034
Commit d4d1d034 authored Nov 23, 2015 by Vadim Pisarevsky
Showing with 2 additions and 2 deletions

CMakeLists.txt modules/videoio/CMakeLists.txt +2 -2

videoio_c.h modules/videoio/include/opencv2/videoio/videoio_c.h +0 -0

cap_ximea.cpp modules/videoio/src/cap_ximea.cpp +0 -0

No files found.
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@@ -126,11 +126,11 @@ if(HAVE_XIMEA)
    link_directories("${XIMEA_LIBRARY_DIR}")
  endif()
  if(WIN32 AND X86_64)
-    list(APPEND VIDEOIO_LIBRARIES m3apiX64)
+    list(APPEND VIDEOIO_LIBRARIES xiapi64)
  elseif(APPLE)
    list(APPEND VIDEOIO_LIBRARIES "-framework m3api")
  else()
-    list(APPEND VIDEOIO_LIBRARIES m3api)
+    list(APPEND VIDEOIO_LIBRARIES xiapi32)
  endif()
 endif(HAVE_XIMEA)


--- a/modules/videoio/include/opencv2/videoio/videoio_c.h
+++ b/modules/videoio/include/opencv2/videoio/videoio_c.h
--- a/modules/videoio/src/cap_ximea.cpp
+++ b/modules/videoio/src/cap_ximea.cpp