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

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()

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" );
         }
     }