Merge pull request #132 from taka-no-me/version-2.4.3

f2af0e7a · Andrey Kamaev · 4ac5223a · 4a2f626d · f2af0e7a · f2af0e7a
Commit f2af0e7a authored Nov 02, 2012 by Andrey Kamaev
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

CMakeLists.txt CMakeLists.txt +1 -1

version.hpp modules/core/include/opencv2/core/version.hpp +1 -1

No files found.
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -493,7 +493,7 @@ include(cmake/OpenCVGenConfig.cmake)
 # Summary:
 # ----------------------------------------------------------------------------
 status("")
-status("General configuration for OpenCV ${OPENCV_VERSION}-rc =====================================")
+status("General configuration for OpenCV ${OPENCV_VERSION} =====================================")
 if(OPENCV_VCSVERSION)
  status("  Version control:" ${OPENCV_VCSVERSION})
 endif()

--- a/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@ -53,6 +53,6 @@

 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)
-#define CV_VERSION          CVAUX_STR(CV_MAJOR_VERSION) "." CVAUX_STR(CV_MINOR_VERSION) "." CVAUX_STR(CV_SUBMINOR_VERSION) "-rc"
+#define CV_VERSION          CVAUX_STR(CV_MAJOR_VERSION) "." CVAUX_STR(CV_MINOR_VERSION) "." CVAUX_STR(CV_SUBMINOR_VERSION)

 #endif