#1041. More polishing to get every version of VS to build using CMake.

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

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"

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)