XIMEA cam support: use correct library for 64 bit Linux
authorIgor Kuzmin <parafin@ximea.com>
Tue, 9 Sep 2014 15:24:16 +0000 (19:24 +0400)
committerIgor Kuzmin <parafin@ximea.com>
Tue, 9 Sep 2014 15:24:16 +0000 (19:24 +0400)
modules/videoio/CMakeLists.txt

index 9490757..4ad564a 100644 (file)
@@ -94,11 +94,13 @@ endif(HAVE_opencv_androidcamera)
 
 if(HAVE_XIMEA)
   list(APPEND videoio_srcs ${CMAKE_CURRENT_LIST_DIR}/src/cap_ximea.cpp)
-  ocv_include_directories(${XIMEA_PATH})
+  if(XIMEA_PATH)
+    ocv_include_directories(${XIMEA_PATH})
+  endif()
   if(XIMEA_LIBRARY_DIR)
     link_directories("${XIMEA_LIBRARY_DIR}")
   endif()
-  if(X86_64)
+  if(WIN32 AND X86_64)
     list(APPEND VIDEOIO_LIBRARIES m3apiX64)
   else()
     list(APPEND VIDEOIO_LIBRARIES m3api)