[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=e8a258c

The following commit has been merged in the master branch:
commit e8a258caf4d3faad4417b0bbdc11f086df042548
Author: Robin Mills <robin at clanmills.com>
Date:   Sat Nov 7 19:14:26 2015 +0000

    #851 Changes to CMake option -DEXIV2_ENABLE_WIN_UNICODE={OFF|ON}
---
 config/CMakeChecks.txt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/config/CMakeChecks.txt b/config/CMakeChecks.txt
index ebcddd6..2209b46 100644
--- a/config/CMakeChecks.txt
+++ b/config/CMakeChecks.txt
@@ -107,9 +107,11 @@ IF( EXIV2_ENABLE_NLS )
     SET( ENABLE_NLS 1 )
 ENDIF( EXIV2_ENABLE_NLS )
 
-# Force unicode support on windows
+# unicode path support on windows
 IF( EXIV2_ENABLE_WIN_UNICODE )
-    SET ( UNICODE_PATH 1 )
+	IF (WIN32)
+    	SET ( UNICODE_PATH 1 )
+    ENDIF()
 ENDIF()
 
 IF( EXIV2_ENABLE_COMMERCIAL )
@@ -284,7 +286,7 @@ ENDFOREACH( entry ${EXV_SYMBOLS} )
 CONFIGURE_FILE( config/config.h.cmake ${CMAKE_SOURCE_DIR}/include/exiv2/exv_conf.h )
 
 # when removing support of VS solution files, get rid of this stuff
-#VSslnCompat 
+#VSslnCompat
 IF (MSVC)
     CONFIGURE_FILE( config/config.h.cmake ${CMAKE_SOURCE_DIR}/include/exiv2/exv_msvc.h )
     CONFIGURE_FILE( ${CMAKE_SOURCE_DIR}/include/exiv2/exv_msvc.h ${CMAKE_BINARY_DIR}/ignore/exv_msvc.h COPYONLY )

-- 
exiv2 packaging