[cpp-msbuild] branch master updated: CPPXT-110 Start to prepare for OpenSSL 1.1

[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.

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

The following commit(s) were added to refs/heads/master by this push:
       new  27541e5   CPPXT-110  Start to prepare for OpenSSL 1.1
27541e5 is described below

commit 27541e55f18aa267652287040a587c51a1823804
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Jul 19 16:00:15 2016 +0100

    CPPXT-110  Start to prepare for OpenSSL 1.1
    
    https://issues.shibboleth.net/jira/browse/CPPXT-110
    
    OpenSSL 1.1 removes the potential need for per architecture dependencies.
    All the header files are checked in to their final resting place, rather than
    being populated somewhere in the murky depths of the build.
    
    In Windows-land this might save us a bit in the build, starting with not having
    to look into the inc32/inc64 directories.  This check in sets that up for us
    in mainline by adding $(OpenSSl)\include to the CC include paths immediately
    after the old style architecture specific directory ($(OpenSSl)\inc32 or inc64).
    
    This way the build keeps working in both cases.
---
 Includes.props          | 4 ++--
 dependencies/xsec.props | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Includes.props b/Includes.props
index c1189ab..8c70b30 100644
--- a/Includes.props
+++ b/Includes.props
@@ -1,8 +1,8 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Wibble">
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
-    <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>
+    <IncludePath Condition="'$(Platform)'=='Win32'">$(BuildRoot)\$(openssl)\inc32;$(BuildRoot)\$(openssl)\include;$(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)\$(openssl)\include;$(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)\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 [...]
diff --git a/dependencies/xsec.props b/dependencies/xsec.props
index 5088762..3e37119 100644
--- a/dependencies/xsec.props
+++ b/dependencies/xsec.props
@@ -4,7 +4,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\VC14\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll.dbg;</AdditionalLibraryDirectories>
@@ -15,7 +15,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug No Xalan|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\VC14\Debug;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll.dbg;</AdditionalLibraryDirectories>
@@ -26,7 +26,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|Win32'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc32;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win32\VC14\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out32dll;</AdditionalLibraryDirectories>
@@ -37,7 +37,7 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release No Xalan|x64'">
     <ClCompile>
       <PreprocessorDefinitions>%(PreprocessorDefinitions);XSEC_HAVE_OPENSSL=1</PreprocessorDefinitions>
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
+      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories);$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\inc64;$(SolutionDir)\..\..\..\..\$(OpenSSl_dir)\include;$(SolutionDir)\..\..\..\..\$(Xerces_dir)\src</AdditionalIncludeDirectories>
     </ClCompile>
     <Link>
       <AdditionalLibraryDirectories>%(AdditionalLibraryDirectories);$(SolutionDir)..\..\..\..\$(Xerces_dir)\Build\Win64\VC14\Release;$(SolutionDir)..\..\..\..\$(Openssl_dir)\out64dll;</AdditionalLibraryDirectories>

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