From b027a84fa1398a0d5e681bd18cb74fa344cfe56e Mon Sep 17 00:00:00 2001 From: Igor Kuzmin Date: Tue, 9 Sep 2014 19:15:03 +0400 Subject: [PATCH] XIMEA cam support: use correct library for 64 bit Linux --- modules/highgui/CMakeLists.txt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/highgui/CMakeLists.txt b/modules/highgui/CMakeLists.txt index 7d2547bcff..a0221c1e50 100644 --- a/modules/highgui/CMakeLists.txt +++ b/modules/highgui/CMakeLists.txt @@ -165,11 +165,13 @@ endif(HAVE_opencv_androidcamera) if(HAVE_XIMEA) list(APPEND highgui_srcs 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 HIGHGUI_LIBRARIES m3apiX64) else() list(APPEND HIGHGUI_LIBRARIES m3api)