[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=12f5b62

The following commit has been merged in the master branch:
commit 12f5b629ffbf5d74dc80e0dcc17f08fb0251b3dd
Author: danielkaneider <kaneiderdaniel at gmail.com>
Date:   Tue Dec 8 16:09:17 2015 +0000

    #1041. Adding better NMake support
---
 contrib/cmake/msvc/cmakeBuild.cmd | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index f00020e..7077d2d 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -277,7 +277,7 @@ pushd        "%EXIV_B%"
     if defined _WEBREADY_ set ENABLE_WEBREADY=-DEXIV2_ENABLE_WEBREADY=ON
     if defined _VIDEO_    set ENABLE_VIDEO=-DEXIV2_ENABLE_VIDEO=ON
 
-    call:run cmake -G "%_GENERATOR_%" %_LINK_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% ^
+    call:run cmake -G "%_GENERATOR_%" -DCMAKE_BUILD_TYPE=%_CONFIG_% %_LINK_% -DCMAKE_INSTALL_PREFIX=%_INSTALL_% -DCMAKE_LIBRARY_PATH=%_LIBPATH_% -DCMAKE_INCLUDE_PATH=%_INCPATH_% ^
               -DEXIV2_ENABLE_NLS=OFF                -DEXIV2_ENABLE_BUILD_SAMPLES=ON ^
               -DEXIV2_ENABLE_WIN_UNICODE=OFF        -DEXIV2_ENABLE_SHARED=ON ^
               %ENABLE_WEBREADY%  %ENABLE_CURL%  %ENABLE_LIBSSH% %ENABLE_VIDEO% ^
@@ -360,7 +360,7 @@ IF NOT EXIST "%LOB%"         7z x "%LOB_TAR%"
 if NOT EXIST "%LOB_B%"       mkdir "%LOB_B%"
 
 pushd "%LOB_B%"
-    call:run cmake -G "%_GENERATOR_%" %_LINK_% %* ..\..\%LOB%
+    call:run cmake -G "%_GENERATOR_%" -DCMAKE_BUILD_TYPE=%_CONFIG_% %_LINK_% %* ..\..\%LOB%
     IF errorlevel 1 (
         echo "*** cmake errors in %LOB% ***"
         popd

-- 
exiv2 packaging