Merge pull request #3247 from a-wi:CMake_MSMF_configuration

9c91d010 · Vadim Pisarevsky · 37a17672 · 7c354c14 · 9c91d010 · 9c91d010
Commit 9c91d010 authored Sep 22, 2014 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 0 deletions

OpenCVFindLibsVideo.cmake cmake/OpenCVFindLibsVideo.cmake +1 -0

CMakeLists.txt modules/highgui/CMakeLists.txt +1 -0

No files found.
--- a/cmake/OpenCVFindLibsVideo.cmake
+++ b/cmake/OpenCVFindLibsVideo.cmake
@@ -228,6 +228,7 @@ if(WITH_DSHOW)
 endif(WITH_DSHOW)

 # --- VideoInput/Microsoft Media Foundation ---
+ocv_clear_vars(HAVE_MSMF)
 if(WITH_MSMF)
  check_include_file(Mfapi.h HAVE_MSMF)
 endif(WITH_MSMF)

--- a/modules/highgui/CMakeLists.txt
+++ b/modules/highgui/CMakeLists.txt
@@ -123,6 +123,7 @@ if (WIN32 AND HAVE_DSHOW)
 endif()

 if (WIN32 AND HAVE_MSMF)
+  list(APPEND highgui_srcs src/cap_msmf.hpp)
  list(APPEND highgui_srcs src/cap_msmf.cpp)
 endif()