generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3204 from parafin:ximea_unix-2.4

Browse Source
This commit is contained in:
Vadim Pisarevsky
2014-09-14 18:44:23 +00:00
parent f4f7522fe7 0421da78b3
commit cf15b9e8ad
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/highgui/CMakeLists.txt
View File

@@ -165,12 +165,16 @@ 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)
elseif(APPLE)
list(APPEND HIGHGUI_LIBRARIES "-framework m3api")
else()
list(APPEND HIGHGUI_LIBRARIES m3api)
endif()