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 ef920e9..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)
@@ -96,6 +98,12 @@ if(CMAKE_VERSION VERSION_GREATER 2.6.2)
   unset(OpenCV_CONFIG_PATH CACHE)
 endif()
 
+if(NOT OpenCV_FIND_QUIETLY)
+  message(STATUS "OpenCV ARCH: ${OpenCV_ARCH}")
+  message(STATUS "OpenCV RUNTIME: ${OpenCV_RUNTIME}")
+  message(STATUS "OpenCV STATIC: ${OpenCV_STATIC}")
+endif()
+
 get_filename_component(OpenCV_CONFIG_PATH "${CMAKE_CURRENT_LIST_FILE}" PATH CACHE)
 if(OpenCV_RUNTIME AND OpenCV_ARCH)
   if(OpenCV_STATIC AND EXISTS "${OpenCV_CONFIG_PATH}/${OpenCV_ARCH}/${OpenCV_RUNTIME}/staticlib/OpenCVConfig.cmake")
@@ -150,8 +158,10 @@ if(OpenCV_LIB_PATH AND EXISTS "${OpenCV_LIB_PATH}/OpenCVConfig.cmake")
   endif()
 else()
   if(NOT OpenCV_FIND_QUIETLY)
-    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)