Merge pull request #3916 from mshabunin:fix-winpack-test

2015-04-10 12:48:31 +00:00 · 2015-04-10 12:48:31 +00:00 · c094c58b51
commit c094c58b51
parent 369a3d1426 97c78838a4
2 changed files with 5 additions and 1 deletions
--- a/cmake/templates/OpenCVConfig.cmake.in
+++ b/cmake/templates/OpenCVConfig.cmake.in
@ -388,6 +388,10 @@ macro(ocv_include_modules)
  include_directories(BEFORE "${OpenCV_INCLUDE_DIRS}")
 endmacro()

+macro(ocv_include_modules_recurse)
+  include_directories(BEFORE "${OpenCV_INCLUDE_DIRS}")
+endmacro()
+
 macro(ocv_target_link_libraries)
  target_link_libraries(${ARGN})
 endmacro()
--- a/modules/superres/src/frame_source.cpp
+++ b/modules/superres/src/frame_source.cpp
@ -126,7 +126,7 @@ namespace
        else
        {
            // should never get here
-            CV_Assert(0);
+            CV_Error(Error::StsBadArg, "Failed to detect input frame kind" );
        }
    }