[SCM] exiv2 packaging branch, master, updated. debian/0.25-3.1-3734-gdcbc29a

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/exiv2.git;a=commitdiff;h=2582a75

The following commit has been merged in the master branch:
commit 2582a756eb616817c6d9f7b691f9b4c3404fe373
Author: Robin Mills <robin at clanmills.com>
Date:   Tue Sep 22 13:37:24 2015 +0000

    #1041  Thanks you to Emmanuel for the patch.  Discussed here:  http://dev.exiv2.org/boards/3/topics/2232
---
 CMakeLists.txt     | 8 ++++++++
 config/config.h.in | 5 -----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e0c178b..475488d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -55,6 +55,7 @@ OPTION( EXIV2_ENABLE_VIDEO         "Build video support into library"
 OPTION( EXIV2_ENABLE_WEBREADY      "Build webready support into library"                   OFF )
 OPTION( EXIV2_ENABLE_CURL          "USE Libcurl for HttpIo"                                ON  )
 OPTION( EXIV2_ENABLE_SSH           "USE Libssh for SshIo"                                  ON  )
+OPTION( EXIV2_ENABLE_WIN_UNICODE   "Use Unicode paths (wstring) on Windows"                OFF )
 
 IF( MINGW OR UNIX )
     IF ( CMAKE_CXX_COMPILER STREQUAL "g++" OR CMAKE_C_COMPILER STREQUAL "gcc" )
@@ -69,6 +70,13 @@ IF( MINGW OR UNIX )
     ENDIF()
 ENDIF( MINGW OR UNIX )
 
+# Force unicode support on windows
+IF (WIN32)
+    IF( EXIV2_ENABLE_WIN_UNICODE )
+        ADD_DEFINITIONS( -DEXV_UNICODE_PATH )
+    ENDIF()
+ENDIF()
+
 INCLUDE_DIRECTORIES( ${CMAKE_SOURCE_DIR}/src/ ${CMAKE_SOURCE_DIR}/include/  ${CMAKE_SOURCE_DIR}/include/exiv2/)
 
 if( MSVC )
diff --git a/config/config.h.in b/config/config.h.in
index b5706bd..2a96ec7 100644
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -225,11 +225,6 @@
 #define SEPARATOR_CHR '/'
 #endif
 
-/* Windows unicode path support */
-#if defined WIN32 && !defined __CYGWIN__ && !defined __MINGW__
-# define EXV_UNICODE_PATH
-#endif
-
 /* Symbol visibility support */
 #ifdef WIN32
 # define EXV_IMPORT __declspec(dllimport)

-- 
exiv2 packaging