Removed useless VERSION macro (and CMake variable)

diff --git a/cmake/OpenCVGenPkgconfig.cmake b/cmake/OpenCVGenPkgconfig.cmake
index 49d6707..7bfc7bc 100644 (file)
--- a/cmake/OpenCVGenPkgconfig.cmake
+++ b/cmake/OpenCVGenPkgconfig.cmake
@@ -12,7 +12,6 @@ set(prefix      "${CMAKE_INSTALL_PREFIX}")
 set(exec_prefix "\${prefix}")
 set(libdir      "") #TODO: need link paths for OpenCV_EXTRA_COMPONENTS
 set(includedir  "\${prefix}/${OPENCV_INCLUDE_INSTALL_PATH}")
-set(VERSION     ${OPENCV_VERSION})
 
 if(CMAKE_BUILD_TYPE MATCHES "Release")
   set(ocv_optkind OPT)

diff --git a/cmake/templates/cvconfig.h.cmake b/cmake/templates/cvconfig.h.cmake
index 8f88ea3..6ebe1c6 100644 (file)
--- a/cmake/templates/cvconfig.h.cmake
+++ b/cmake/templates/cvconfig.h.cmake
@@ -91,9 +91,6 @@
 /* OpenCV compiled as static or dynamic libs */
 #cmakedefine  BUILD_SHARED_LIBS
 
-/* Version number of package */
-#define  VERSION "${PACKAGE_VERSION}"
-
 /* Define to 1 if your processor stores words with the most significant byte
    first (like Motorola and SPARC, unlike Intel and VAX). */
 #cmakedefine  WORDS_BIGENDIAN

diff --git a/cmake/templates/opencv-XXX.pc.cmake.in b/cmake/templates/opencv-XXX.pc.cmake.in
index 4f6415c..c9dedb0 100644 (file)
--- a/cmake/templates/opencv-XXX.pc.cmake.in
+++ b/cmake/templates/opencv-XXX.pc.cmake.in
@@ -8,6 +8,6 @@ includedir_new=@includedir@
 
 Name: OpenCV
 Description: Open Source Computer Vision Library
-Version: @VERSION@
+Version: @OPENCV_VERSION@
 Libs: @OpenCV_LIB_COMPONENTS@
 Cflags: -I${includedir_old} -I${includedir_new}