From 3b7b833a4e74879eb1c1e82e4322dbeac6d8db17 Mon Sep 17 00:00:00 2001
From: Vadim Pisarevsky <no@email>
Date: Wed, 17 Aug 2011 20:12:11 +0000
Subject: [PATCH] merged latest fixes from 2.3 branch; since 2.3.1 is out, the
 version in trunk is bumped to 2.3.2

---
 CMakeLists.txt                                | 10 ++++++++--
 modules/core/include/opencv2/core/version.hpp |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b4c1c700e..07096244b1 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1223,7 +1223,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
     endif()
 
     if(X86 OR X86_64)
-        if(NOT APPLE AND ${CMAKE_SIZEOF_VOID_P} EQUAL 4)
+        if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
             set(EXTRA_C_FLAGS_RELEASE "${EXTRA_C_FLAGS_RELEASE} -mfpmath=387")
         endif()
     endif()
@@ -1499,9 +1499,15 @@ set(BUILD_PACKAGE ON CACHE BOOL "Enables 'make package_source' command")
 if(BUILD_PACKAGE)
     set(TARBALL_NAME "${CMAKE_PROJECT_NAME}-${OPENCV_VERSION_MAJOR}.${OPENCV_VERSION_MINOR}.${OPENCV_VERSION_PATCH}")
     if (NOT WIN32)
+        if(APPLE)
+            set(TAR_CMD gnutar)
+        else()
+            set(TAR_CMD tar)
+        endif()
+        set(TAR_TRANSFORM "\"s,^,${TARBALL_NAME}/,\"")
         add_custom_target(package_source
         #TODO: maybe we should not remove dll's
-        COMMAND tar --transform 's,^,${TARBALL_NAME}/,S' -cjpf ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL_NAME}.tar.bz2 --exclude-vcs --exclude="*.pyc" --exclude="*.vcproj" --exclude="*/lib/*" --exclude="*.dll" ./
+        COMMAND ${TAR_CMD} --transform ${TAR_TRANSFORM} -cjpf ${CMAKE_CURRENT_BINARY_DIR}/${TARBALL_NAME}.tar.bz2 --exclude=".svn" --exclude="*.pyc" --exclude="*.vcproj" --exclude="*/lib/*" --exclude="*.dll" ./
         WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
     else()
         add_custom_target(package_source
diff --git a/modules/core/include/opencv2/core/version.hpp b/modules/core/include/opencv2/core/version.hpp
index 0cd25ca8b3..897d2dcc67 100644
--- a/modules/core/include/opencv2/core/version.hpp
+++ b/modules/core/include/opencv2/core/version.hpp
@@ -49,7 +49,7 @@
 
 #define CV_MAJOR_VERSION    2
 #define CV_MINOR_VERSION    3
-#define CV_SUBMINOR_VERSION 1
+#define CV_SUBMINOR_VERSION 2
 
 #define CVAUX_STR_EXP(__A)  #__A
 #define CVAUX_STR(__A)      CVAUX_STR_EXP(__A)