Merge pull request #3863 from MSOpenTech:fix_winrt_linker

17459364 · Vadim Pisarevsky · dec722b2 · c196df6d · 17459364
Commit 17459364 authored Mar 24, 2015 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake +3 -1

No files found.
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@@ -262,7 +262,9 @@ endif(WITH_MSMF)
 # --- Extra HighGUI and VideoIO libs on Windows ---
 if(WIN32)
  list(APPEND HIGHGUI_LIBRARIES comctl32 gdi32 ole32 setupapi ws2_32)
-  list(APPEND VIDEOIO_LIBRARIES vfw32)
+  if(HAVE_VFW)
+    list(APPEND VIDEOIO_LIBRARIES vfw32)
+  endif()
  if(MINGW64)
    list(APPEND VIDEOIO_LIBRARIES avifil32 avicap32 winmm msvfw32)
    list(REMOVE_ITEM VIDEOIO_LIBRARIES vfw32)