From 97c78838a4a2da8a6edd3d46170eea82c9184393 Mon Sep 17 00:00:00 2001 From: Maksim Shabunin Date: Fri, 10 Apr 2015 11:37:16 +0300 Subject: [PATCH] Fixed windows build and one warning --- cmake/templates/OpenCVConfig.cmake.in | 4 ++++ modules/superres/src/frame_source.cpp | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in index ee4a186430..bdc4c56f96 100644 --- 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() diff --git a/modules/superres/src/frame_source.cpp b/modules/superres/src/frame_source.cpp index 216e869c14..f7b9685ab0 100644 --- 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" ); } }