Merge pull request #2801 from ilya-lavrenov:tapi_reduction

[profile/ivi/opencv.git] / cmake / OpenCVConfig.cmake

diff --git a/cmake/OpenCVConfig.cmake b/cmake/OpenCVConfig.cmake
index b13a8c6..2d80f76 100644 (file)
--- a/cmake/OpenCVConfig.cmake
+++ b/cmake/OpenCVConfig.cmake
@@ -77,6 +77,8 @@ if(MSVC)
     set(OpenCV_RUNTIME vc10)
   elseif(MSVC_VERSION EQUAL 1700)
     set(OpenCV_RUNTIME vc11)
+  elseif(MSVC_VERSION EQUAL 1800)
+    set(OpenCV_RUNTIME vc12)
   endif()
 elseif(MINGW)
   set(OpenCV_RUNTIME mingw)
@@ -156,51 +158,11 @@ if(OpenCV_LIB_PATH AND EXISTS "${OpenCV_LIB_PATH}/OpenCVConfig.cmake")
   endif()
 else()
   if(NOT OpenCV_FIND_QUIETLY)
-# TODO Fix message
-    message(WARNING "Found OpenCV 2.4.3 Windows Super Pack but it has not binaries compatible with your configuration.
-    You should manually point CMake variable OpenCV_DIR to your build of OpenCV library.")
+    message(WARNING
+"Found OpenCV Windows Pack but it has not binaries compatible with your configuration.
+You should manually point CMake variable OpenCV_DIR to your build of OpenCV library."
+    )
   endif()
   set(OpenCV_FOUND FALSE CACHE BOOL "" FORCE)
   set(OPENCV_FOUND FALSE CACHE BOOL "" FORCE)
 endif()
-
-
-#
-# Some macroses for samples
-#
-macro(ocv_check_dependencies)
-  set(OCV_DEPENDENCIES_FOUND TRUE)
-  foreach(d ${ARGN})
-    if(NOT TARGET ${d})
-      set(OCV_DEPENDENCIES_FOUND FALSE)
-      break()
-    endif()
-  endforeach()
-endmacro()
-
-# adds include directories in such way that directories from the OpenCV source tree go first
-function(ocv_include_directories)
-  set(__add_before "")
-  foreach(dir ${ARGN})
-    get_filename_component(__abs_dir "${dir}" ABSOLUTE)
-    if("${__abs_dir}" MATCHES "^${OpenCV_DIR}")
-      list(APPEND __add_before "${dir}")
-    else()
-      include_directories(AFTER SYSTEM "${dir}")
-    endif()
-  endforeach()
-  include_directories(BEFORE ${__add_before})
-endfunction()
-
-macro(ocv_include_modules)
-  include_directories(BEFORE "${OpenCV_INCLUDE_DIRS}")
-endmacro()
-
-# remove all matching elements from the list
-macro(ocv_list_filterout lst regex)
-  foreach(item ${${lst}})
-    if(item MATCHES "${regex}")
-      list(REMOVE_ITEM ${lst} "${item}")
-    endif()
-  endforeach()
-endmacro()