Merge pull request #3247 from a-wi:CMake_MSMF_configuration

2014-09-22 15:31:09 +00:00
parent 37a1767286 7c354c14f7
commit 9c91d0103f
2 changed files with 2 additions and 0 deletions
--- 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()