XIMEA cam support: use correct library for 64 bit Linux
This commit is contained in:
parent
faed8f43d6
commit
b027a84fa1
@ -165,11 +165,13 @@ endif(HAVE_opencv_androidcamera)
|
|||||||
|
|
||||||
if(HAVE_XIMEA)
|
if(HAVE_XIMEA)
|
||||||
list(APPEND highgui_srcs src/cap_ximea.cpp)
|
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)
|
if(XIMEA_LIBRARY_DIR)
|
||||||
link_directories("${XIMEA_LIBRARY_DIR}")
|
link_directories("${XIMEA_LIBRARY_DIR}")
|
||||||
endif()
|
endif()
|
||||||
if(X86_64)
|
if(WIN32 AND X86_64)
|
||||||
list(APPEND HIGHGUI_LIBRARIES m3apiX64)
|
list(APPEND HIGHGUI_LIBRARIES m3apiX64)
|
||||||
else()
|
else()
|
||||||
list(APPEND HIGHGUI_LIBRARIES m3api)
|
list(APPEND HIGHGUI_LIBRARIES m3api)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user