From 473bfb0019d09f04ad75ea240056669e077c0b2d Mon Sep 17 00:00:00 2001 From: Roman Donchenko Date: Thu, 12 Sep 2013 16:37:30 +0400 Subject: [PATCH] Updated the build config files to deal with the version status. I didn't make the status part of the version variables here, because letters don't play too well with version comparison algorithms (especially with CMake's, which only supports numbers). --- cmake/templates/OpenCVConfig-version.cmake.in | 2 +- cmake/templates/OpenCVConfig.cmake.in | 6 ++++-- cmake/templates/opencv-XXX.pc.cmake.in | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/cmake/templates/OpenCVConfig-version.cmake.in b/cmake/templates/OpenCVConfig-version.cmake.in index 0b432a074c..b5ac5f8e29 100644 --- a/cmake/templates/OpenCVConfig-version.cmake.in +++ b/cmake/templates/OpenCVConfig-version.cmake.in @@ -1,4 +1,4 @@ -set(OpenCV_VERSION @OPENCV_VERSION@) +set(OpenCV_VERSION @OPENCV_VERSION_PLAIN@) set(PACKAGE_VERSION ${OpenCV_VERSION}) set(PACKAGE_VERSION_EXACT False) diff --git a/cmake/templates/OpenCVConfig.cmake.in b/cmake/templates/OpenCVConfig.cmake.in index 1dcd840307..90749488a7 100644 --- a/cmake/templates/OpenCVConfig.cmake.in +++ b/cmake/templates/OpenCVConfig.cmake.in @@ -22,11 +22,12 @@ # - OpenCV_INCLUDE_DIRS : The OpenCV include directories. # - OpenCV_COMPUTE_CAPABILITIES : The version of compute capability # - OpenCV_ANDROID_NATIVE_API_LEVEL : Minimum required level of Android API -# - OpenCV_VERSION : The version of this OpenCV build: "@OPENCV_VERSION@" +# - OpenCV_VERSION : The version of this OpenCV build: "@OPENCV_VERSION_PLAIN@" # - OpenCV_VERSION_MAJOR : Major version part of OpenCV_VERSION: "@OPENCV_VERSION_MAJOR@" # - OpenCV_VERSION_MINOR : Minor version part of OpenCV_VERSION: "@OPENCV_VERSION_MINOR@" # - OpenCV_VERSION_PATCH : Patch version part of OpenCV_VERSION: "@OPENCV_VERSION_PATCH@" # - OpenCV_VERSION_TWEAK : Tweak version part of OpenCV_VERSION: "@OPENCV_VERSION_TWEAK@" +# - OpenCV_VERSION_STATUS : Development status of this build: "@OPENCV_VERSION_STATUS@" # # Advanced variables: # - OpenCV_SHARED @@ -96,11 +97,12 @@ mark_as_advanced(FORCE OpenCV_LIB_DIR_OPT OpenCV_LIB_DIR_DBG OpenCV_3RDPARTY_LIB # ====================================================== # Version variables: # ====================================================== -SET(OpenCV_VERSION @OPENCV_VERSION@) +SET(OpenCV_VERSION @OPENCV_VERSION_PLAIN@) SET(OpenCV_VERSION_MAJOR @OPENCV_VERSION_MAJOR@) SET(OpenCV_VERSION_MINOR @OPENCV_VERSION_MINOR@) SET(OpenCV_VERSION_PATCH @OPENCV_VERSION_PATCH@) SET(OpenCV_VERSION_TWEAK @OPENCV_VERSION_TWEAK@) +SET(OpenCV_VERSION_STATUS "@OPENCV_VERSION_STATUS@") # ==================================================================== # Link libraries: e.g. libopencv_core.so, opencv_imgproc220d.lib, etc... diff --git a/cmake/templates/opencv-XXX.pc.cmake.in b/cmake/templates/opencv-XXX.pc.cmake.in index c9dedb0da3..5b94e4d6c3 100644 --- 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: @OPENCV_VERSION@ +Version: @OPENCV_VERSION_PLAIN@ Libs: @OpenCV_LIB_COMPONENTS@ Cflags: -I${includedir_old} -I${includedir_new}