[cpp-msbuild] branch master updated: SSPCPP-756 Add a generally useable PATH to Includes.props

Rod Widdowson rdw at steadingsoftware.com
Mon Oct 2 04:53:28 EDT 2017


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=ab3c8e0445b48645e4d552abbb710f6e4155b2fe

The following commit(s) were added to refs/heads/master by this push:
       new  ab3c8e0   SSPCPP-756 Add a generally useable PATH to Includes.props
ab3c8e0 is described below

commit ab3c8e0445b48645e4d552abbb710f6e4155b2fe
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Mon Oct 2 09:51:16 2017 +0100

    SSPCPP-756 Add a generally useable PATH to Includes.props
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-756
    
    We have all the information needed, so gather it together into property called
    $(ShibRunPath) which can then be easily added to the paths of things we want to
    debug.
---
 Includes.props | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Includes.props b/Includes.props
index c7c8aea..e514bfe 100644
--- a/Includes.props
+++ b/Includes.props
@@ -5,7 +5,17 @@
 
     <SSLLib>libcrypto.lib;libssl.lib</SSLLib>
     <SSLLibD>libcrypto.lib;libssl.lib</SSLLibD>
-    <ExecutablePath>$(ExecutablePath)</ExecutablePath>
+
+    <ShibRunPath Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">$(BuildRoot)\cpp-xmltooling\build\$(MsVcVersion)\$(Platform)\$(Configuration);$(BuildRoot)\cpp-opensaml\build\$(MsVcVersion)\$(Platform)\$(Configuration);$(BuildRoot)$(openssl)\x64Debug\bin;$(BuildRoot)$(xerces)\install64\$(MsVCVersion)\bin;$(BuildRoot)$(log4shib)\ms$(MsVCVersion)\$(platform)\$(Configuration);$(BuildRoot)\$(xmlsec)\Build\$(Platform)\$(MsVCVersion)\$(Configuration) Minimal;$(BuildRoot)$(zlib)\$(Platf [...]
+
+    <ShibRunPath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\cpp-xmltooling\build\$(MsVcVersion)\$(Configuration);$(BuildRoot)\cpp-opensaml\build\$(MsVcVersion)\$(Configuration);$(BuildRoot)$(openssl)\x86Debug\bin;$(BuildRoot)$(xerces)\install32\$(MsVCVersion)\bin;$(BuildRoot)$(log4shib)\ms$(MsVCVersion)\$(Configuration);$(BuildRoot)\$(xmlsec)\Build\$(Platform)\$(MsVCVersion)\$(Configuration) Minimal;$(BuildRoot)$(zlib)\$(Configuration);$(BuildRoot)$(curl)/buil [...]
+
+    <ShibRunPath Condition="'$(Configuration)|$(Platform)'=='Release|x64'">$(BuildRoot)\cpp-xmltooling\build\$(MsVcVersion)\$(Platform)\$(Configuration);$(BuildRoot)\cpp-opensaml\build\$(MsVcVersion)\$(Platform)\$(Configuration);$(BuildRoot)$(openssl)\x64Debug\bin;$(BuildRoot)$(xerces)\install64\$(MsVCVersion)\bin;$(BuildRoot)$(log4shib)\ms$(MsVCVersion)\$(platform)\$(Configuration);$(BuildRoot)\$(xmlsec)\Build\$(Platform)\$(MsVCVersion)\$(Configuration) Minimal;$(BuildRoot)$(zlib)\$(Pla [...]
+
+    <ShibRunPath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\cpp-xmltooling\build\$(MsVcVersion)\$(Configuration);$(BuildRoot)\cpp-opensaml\build\$(MsVcVersion)\$(Configuration);$(BuildRoot)$(openssl)\x86Debug\bin;$(BuildRoot)$(xerces)\install32\$(MsVCVersion)\bin;$(BuildRoot)$(log4shib)\ms$(MsVCVersion)\$(Configuration);$(BuildRoot)\$(xmlsec)\Build\$(Platform)\$(MsVCVersion)\$(Configuration) Minimal;$(BuildRoot)$(zlib)\$(Configuration);$(BuildRoot)$(curl)/bu [...]
+
+
+
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">$(BuildRoot)\$(openssl)\X86Debug\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>
 
     <IncludePath Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">$(BuildRoot)\$(openssl)\x86\include;$(BuildRoot)\$(openssl)\include;$(BuildRoot)\$(curl)\include;$(BuildRoot)\$(log4shib)\include;$(BuildRoot)\$(xerces)\Install32\$(MsVCVersion)\include;$(BuildRoot)\$(xmlsec);$(BuildRoot)\nsapi\include;$(BuildRoot)\$(fcgi)\include;$(BuildRoot)\cxxtest;$(BuildRoot)\$(zlib);$(BuildRoot)\$(boost);$(IncludePath)</IncludePath>

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


More information about the commits mailing list