generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-10 12:48:31 +00:00
commit c094c58b51
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/templates/OpenCVConfig.cmake.in
View File

@ -388,6 +388,10 @@ macro(ocv_include_modules)
include_directories(BEFORE "${OpenCV_INCLUDE_DIRS}") include_directories(BEFORE "${OpenCV_INCLUDE_DIRS}")
endmacro() endmacro()
macro(ocv_include_modules_recurse)
include_directories(BEFORE "${OpenCV_INCLUDE_DIRS}")
endmacro()
macro(ocv_target_link_libraries) macro(ocv_target_link_libraries)
target_link_libraries(${ARGN}) target_link_libraries(${ARGN})
endmacro() endmacro()

2
modules/superres/src/frame_source.cpp
View File

@ -126,7 +126,7 @@ namespace
else else
{ {
// should never get here // should never get here
CV_Assert(0); CV_Error(Error::StsBadArg, "Failed to detect input frame kind" );
} }
} }