From 4d45a2c43f5b2f0066e9ef5573ebe680e15cdcd5 Mon Sep 17 00:00:00 2001 From: Igor Kuzmin Date: Tue, 9 Sep 2014 19:24:16 +0400 Subject: [PATCH] XIMEA cam support: use correct library for 64 bit Linux --- modules/videoio/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/videoio/CMakeLists.txt b/modules/videoio/CMakeLists.txt index 94907575d3..4ad564af36 100644 --- a/modules/videoio/CMakeLists.txt +++ b/modules/videoio/CMakeLists.txt @@ -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)