From 6895e9ca5b3609c1132219f5d01e47ed1e89a07a Mon Sep 17 00:00:00 2001
From: Robin Mills <robin@clanmills.com>
Date: Sat, 28 Nov 2015 11:24:38 +0000
Subject: [PATCH] #1041.  More polishing to get every version of VS to build
 using CMake.

---
 contrib/cmake/msvc/cmakeBuild.cmd      |  2 +-
 contrib/cmake/msvc/cmakeRebuildAll.cmd | 26 ++++++++++++++------------
 include/exiv2/types.hpp                |  6 ++++++
 3 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/contrib/cmake/msvc/cmakeBuild.cmd b/contrib/cmake/msvc/cmakeBuild.cmd
index 8db3018f..0cfdee50 100755
--- a/contrib/cmake/msvc/cmakeBuild.cmd
+++ b/contrib/cmake/msvc/cmakeBuild.cmd
@@ -259,7 +259,7 @@ if DEFINED _WEBREADY_ (
 echo ---------- EXIV2 building with cmake ------------------
 set          "EXIV_B=%_TEMP_%\exiv2"
 
-rem if defined _REBUILD_    rmdir/s/q "%EXIV_B%"
+if defined _REBUILD_        rmdir/s/q "%EXIV_B%"
 IF NOT EXIST "%EXIV_B%"     mkdir     "%EXIV_B%"
 pushd        "%EXIV_B%"
 	set ENABLE_CURL=-DEXIV2_ENABLE_CURL=OFF
diff --git a/contrib/cmake/msvc/cmakeRebuildAll.cmd b/contrib/cmake/msvc/cmakeRebuildAll.cmd
index 0417cb25..22cf679c 100755
--- a/contrib/cmake/msvc/cmakeRebuildAll.cmd
+++ b/contrib/cmake/msvc/cmakeRebuildAll.cmd
@@ -1,12 +1,14 @@
-cmd /c "vcvars 2005 64 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2005 32 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2015 64 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2015 32 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2013 64 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2013 32 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2012 64 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2012 32 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2010 64 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2010 32 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2008 64 && cmakeBuild --rebuild --test 2>&1"
-cmd /c "vcvars 2008 32 && cmakeBuild --rebuild --test 2>&1"
+for %%a in (64 32) do for %%v in (2012 2010 2015 2013 2008 2005) do cmd /c "vcvars %%v %%a && cmakeBuild --rebuild --test 2>&1" 
+
+rem cmd /c "vcvars 2012 64 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2012 32 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2015 64 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2015 32 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2013 64 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2013 32 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2005 64 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2005 32 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2010 64 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2010 32 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2008 64 && cmakeBuild --rebuild --test 2>&1"
+rem cmd /c "vcvars 2008 32 && cmakeBuild --rebuild --test 2>&1"
diff --git a/include/exiv2/types.hpp b/include/exiv2/types.hpp
index 32efbd6a..40986335 100644
--- a/include/exiv2/types.hpp
+++ b/include/exiv2/types.hpp
@@ -44,6 +44,12 @@
 #include <algorithm>
 #include <sstream>
 
+#ifdef _MSC_VER
+#  ifdef  EXV_HAVE_STDINT_H
+#   undef EXV_HAVE_STDINT_H
+# endif
+#endif
+
 #ifdef EXV_HAVE_STDINT_H
 # include <stdint.h>
 #elif defined(_MSC_VER)