Merge pull request #6012 from mzajko:xi_cmake_update

4894aac5 · Alexander Alekhin · 1cd3c6f3 · a387d6fa · 4894aac5
Commit 4894aac5 authored Jan 29, 2016 by Alexander Alekhin
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

CMakeLists.txt modules/videoio/CMakeLists.txt +3 -1

No files found.
--- a/modules/videoio/CMakeLists.txt
+++ b/modules/videoio/CMakeLists.txt
@@ -131,10 +131,12 @@ if(HAVE_XIMEA)
  endif()
  if(WIN32 AND X86_64)
    list(APPEND VIDEOIO_LIBRARIES xiapi64)
+  elseif(WIN32)
+    list(APPEND VIDEOIO_LIBRARIES xiapi32)
  elseif(APPLE)
    list(APPEND VIDEOIO_LIBRARIES "-framework m3api")
  else()
-    list(APPEND VIDEOIO_LIBRARIES xiapi32)
+    list(APPEND VIDEOIO_LIBRARIES m3api)
  endif()
 endif(HAVE_XIMEA)