[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=9286acd

The following commit has been merged in the master branch:
commit 9286acd397cea435e909dbc24cae099d4cfa0b3e
Author: Robin Mills <robin at clanmills.com>
Date:   Thu Dec 10 10:05:18 2015 +0000

    #1041.  debugging vcvars.bat
---
 contrib/cmake/msvc/vcvars.bat | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/contrib/cmake/msvc/vcvars.bat b/contrib/cmake/msvc/vcvars.bat
index 316a810..ea39aa8 100755
--- a/contrib/cmake/msvc/vcvars.bat
+++ b/contrib/cmake/msvc/vcvars.bat
@@ -1,5 +1,10 @@
 @echo off
 
+echo -------- start of vcvars.bat -------------
+echo args = %*
+set
+echo ------------------------------------------
+
 if defined VSINSTALLDIR (
 	echo already installed
     goto eof
@@ -20,6 +25,7 @@ if "%_ARG_%" EQU "2005" (
   if "%_OPT_%" EQU "64" (
     pushd "%ProgramFiles(x86)%\Microsoft Visual Studio 8\VCinmd64\"
     call vcvarsamd64.bat
+    set PROCESSOR_ARCHITECTURE=AMD64
   ) else (
     pushd "%ProgramFiles(x86)%\Microsoft Visual Studio 8\VCin"
     call vcvars32.bat
@@ -39,10 +45,10 @@ if "%_ARG_%" EQU "2013" set "_VC_=12.0"
 if "%_ARG_%" EQU "2015" set "_VC_=14.0"
 
 if DEFINED _VC_ (
-  @echo on
   pushd "%ProgramFiles(x86)%\Microsoft Visual Studio %_VC_%\VC\"
   if "%_OPT_%" EQU "64" (
     vcvarsall.bat x86_amd64
+    set PROCESSOR_ARCHITECTURE=AMD64
   ) else (
     vcvarsall.bat x86
     set PROCESSOR_ARCHITECTURE=x86
@@ -59,4 +65,8 @@ if DEFINED _VC_ (
   call:help
 )
 
+echo ---------- end of vcvars.bat -------------
+set
+echo ------------------------------------------
+
 :eof

-- 
exiv2 packaging