Version modifications.

OpenCVConfig-version.cmake.in

-SET(OpenCV_VERSION @OPENCV_VERSION@)
-SET(OpenCV_VERSION_MAJOR  @OPENCV_VERSION_MAJOR@)
-SET(OpenCV_VERSION_MINOR  @OPENCV_VERSION_MINOR@)
-SET(OpenCV_VERSION_PATCH  @OPENCV_VERSION_PATCH@)
+set(OpenCV_VERSION @OPENCV_VERSION@)
 set(PACKAGE_VERSION ${OpenCV_VERSION})
-if("${PACKAGE_FIND_VERSION_MAJOR}" EQUAL ${OpenCV_VERSION_MAJOR})
-  set(PACKAGE_VERSION_COMPATIBLE True) # compatible with any version @OPENCV_VERSION_MAJOR@.x.x
-  if("${PACKAGE_FIND_VERSION_MINOR}" EQUAL ${OpenCV_VERSION_MINOR})
-    set(PACKAGE_VERSION_COMPATIBLE True)    # compatible with any version @OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.x
-    if("${PACKAGE_FIND_VERSION_PATCH}" EQUAL ${OpenCV_VERSION_PATCH})
-      set(PACKAGE_VERSION_EXACT True)    # exact match for patch @OPENCV_VERSION_MAJOR@.@OPENCV_VERSION_MINOR@.@OPENCV_VERSION_PATCH@
-    endif()
- endif()
+
+set(PACKAGE_VERSION_EXACT False)
+set(PACKAGE_VERSION_COMPATIBLE False)
+
+if(${PACKAGE_FIND_VERSION} VERSION_EQUAL ${PACKAGE_VERSION})
+  set(PACKAGE_VERSION_EXACT True)
+  set(PACKAGE_VERSION_COMPATIBLE True)
+endif()
+
+if(${PACKAGE_FIND_VERSION} VERSION_LESS ${PACKAGE_VERSION})
+  set(PACKAGE_VERSION_COMPATIBLE True)
 endif()

opencv-XXX.pc.cmake.in

+# Package Information for pkg-config
+
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir_old=@includedir@/opencv
+includedir_new=@includedir@
+
+Name: OpenCV
+Description: Open Source Computer Vision Library
+Version: @VERSION@
+Libs: @OpenCV_LIB_COMPONENTS@
+Cflags: -I${includedir_old} -I${includedir_new}