[cpp-msbuild] 02/02: Indirect away the VC version for the 'new build' Curl path

Rod Widdowson rdw at steadingsoftware.com
Mon Dec 19 06:14:00 EST 2016


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

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

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=c1ffe82d9290a71c92d741567cbcf3e1c02f02fa

commit c1ffe82d9290a71c92d741567cbcf3e1c02f02fa
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Dec 19 11:13:48 2016 +0000

    Indirect away the VC version for the 'new build' Curl path
---
 Includes.props | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Includes.props b/Includes.props
index dce95e0..834ceca 100644
--- a/Includes.props
+++ b/Includes.props
@@ -21,13 +21,13 @@
 
     <ReferencePath>$(ReferencePath)</ReferencePath>
 
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$(BuildRoot)\ [...]
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\out32dll.dbg;$(BuildRoot)\$(openssl)\x86debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Debug;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\nsapi\lib;$(B [...]
 
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Release No Xa [...]
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\out32dll;$(BuildRoot)\$(openssl)\x86\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x86-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\Release;$(BuildRoot)\$(xerces)\Build\Win32\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\Win32\$(MSVCVERSION)\Rel [...]
 
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\Win32\x64\D [...]
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\$(openssl)\out64dll.dbg;$(BuildRoot)\$(openssl)\x64debug\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-debug-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\debug-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Debug;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Debug;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Debug No Xalan;$(BuildRoot)\$(fcgi)\W [...]
 
-    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-vc10-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcgi)\Win32\x6 [...]
+    <LibraryPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\$(openssl)\out64dll;$(BuildRoot)\$(openssl)\x64\lib;$(BuildRoot)\$(curl)\builds\libcurl-$(MsVCVersion)-x64-release-dll-ssl-dll-zlib-dll-ipv6-sspi\lib;$(BuildRoot)\$(curl)\lib\release-dll-ssl-dll-zlib-dll.x64;$(BuildRoot)\$(log4shib)\ms$(MsVCVersion)\x64\Release;$(BuildRoot)\$(xerces)\Build\Win64\$(MSVCVERSION)\Release;$(BuildRoot)\$(xmlsec)\Build\x64\$(MSVCVERSION)\Release No Xalan;$(BuildRoot)\$(fcgi [...]
     <SourcePath>$(SourcePath)</SourcePath>
 
     <ExcludePath>$(ExcludePath)</ExcludePath>

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


More information about the commits mailing list