Fix the build of OpenCV with XIMEA on Windows 64 bits:

- crosses initializations in "cap_ximea.cpp" (which also contained some awfull "goto" instructions)
  - the "CMAKE_CL_64" variable is not initialized when using mingw

PR#1039 modified to be able to merge on branch 2.4
This commit is contained in:
Philippe FOUBERT
2013-11-10 17:46:59 +01:00
parent 0ac61240c5
commit 8b0fc04d93
3 changed files with 87 additions and 66 deletions

View File

@@ -167,9 +167,9 @@ if(HAVE_XIMEA)
list(APPEND highgui_srcs src/cap_ximea.cpp)
ocv_include_directories(${XIMEA_PATH})
if(XIMEA_LIBRARY_DIR)
link_directories(${XIMEA_LIBRARY_DIR})
endif()
if(CMAKE_CL_64)
link_directories("${XIMEA_LIBRARY_DIR}")
endif()
if(X86_64)
list(APPEND HIGHGUI_LIBRARIES m3apiX64)
else()
list(APPEND HIGHGUI_LIBRARIES m3api)