[cpp-msbuild] branch master updated: Make VC version a property

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

The following commit(s) were added to refs/heads/master by this push:
       new  9846d77   Make VC version a property
9846d77 is described below

commit 9846d77dca6ed8e54ef0dab244efba1999545751
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Sat Apr 23 15:59:57 2016 +0100

    Make VC version a property
    
    As we prepare to move to VC14, pop the vc version into a property and indirect through
    that.
---
 Includes.props | 4 ++--
 Versions.props | 2 ++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Includes.props b/Includes.props
index 9994a8b..c1189ab 100644
--- a/Includes.props
+++ b/Includes.props
@@ -4,8 +4,8 @@
     <IncludePath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
     <IncludePath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\inc64;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\src;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
     <ReferencePath>$(ReferencePath)</ReferencePath>
-    <LibraryPath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\msvc10\Debug;$(BuildRoot)\$(log4shib)\msvc10\Release;$(BuildRoot)\$(xerces)\Build\Win32\VC10\Debug;$(BuildRoot)\$(xerces)\Build\Win32\VC10\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Build\Win32\VC [...]
-    <LibraryPath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\msvc10\x64\Debug;$(BuildRoot)\$(log4shib)\msvc10\x64\Release;$(BuildRoot)\$(xerces)\Build\Win64\VC10\Debug;$(BuildRoot)\$(xerces)\Build\Win64\VC10\Release;$(BuildRoot)\$(xmlsec)\Build\x64\VC10\Debug No Xalan;$(BuildRoot)\$(xmlsec)\Bu [...]
+    <LibraryPath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\De [...]
+    <LibraryPath Condition="'$(Platform)'=='x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSV [...]
     <SourcePath>$(SourcePath)</SourcePath>
     <ExcludePath>$(ExcludePath)</ExcludePath>
   </PropertyGroup>
diff --git a/Versions.props b/Versions.props
index d2aa226..2dc0171 100644
--- a/Versions.props
+++ b/Versions.props
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="VersionMacros">
+    <MsVCVersion>vc10</MsVCVersion>
+
     <CxxTestRoot>$(BuildRoot)\cxxtest</CxxTestRoot>
 
     <ShibbolethVersion>2.5.6</ShibbolethVersion>

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.