[cpp-msbuild] branch master updated: CPPXT-110 Enabling technology for varying OpenSSL lib names

[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=ae121d2a417dba45d9eeff975265da430d7d23bd

The following commit(s) were added to refs/heads/master by this push:
       new  ae121d2   CPPXT-110 Enabling technology for varying OpenSSL lib names
ae121d2 is described below

commit ae121d2a417dba45d9eeff975265da430d7d23bd
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Fri Jul 29 15:19:24 2016 +0100

    CPPXT-110 Enabling technology for varying OpenSSL lib names
    
    https://issues.shibboleth.net/jira/browse/CPPXT-110
    
    In OpenSSL V1.1 the lib names change from ssleay32 and libeay32
    to libcrypto and libssl.
    
    Introduce a Versions property <OpenSSL1_1Libs> to decide between
    the two.
    
    Introduce Include predicate properties <SSLLib> and <SSLLibD>,
    driven by the above to select the 'right' lib names.
    
    It remains to s/ssleay32.lib;libeay32.lib/${SSLLib}/ in the
    appropriate projects.
---
 Includes.props | 4 ++++
 Versions.props | 1 +
 2 files changed, 5 insertions(+)

diff --git a/Includes.props b/Includes.props
index 8c70b30..f1c322e 100644
--- a/Includes.props
+++ b/Includes.props
@@ -1,5 +1,9 @@
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup Label="Wibble">
+    <SSLLib Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32.lib;libeay32.lib</SSLLib>
+    <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '0'">ssleay32D.lib;libeay32D.lib</SSLLibD>
+    <SSLLib Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLib>
+    <SSLLibD Condition="'$(OpenSSL1_1Libs)' == '1'">libcrypto.lib;libssl.lib</SSLLibD>
     <ExecutablePath>$(ExecutablePath)</ExecutablePath>
     <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>
diff --git a/Versions.props b/Versions.props
index fe248eb..180820b 100644
--- a/Versions.props
+++ b/Versions.props
@@ -56,6 +56,7 @@
     <OpenSSLDirVersion>1.0.2h</OpenSSLDirVersion>
     <openssl>openssl-$(OpenSSLDirVersion)</openssl>
     <OpenSSLFileVersion>1_0_2_4</OpenSSLFileVersion>
+    <OpenSSL1_1Libs>0</OpenSSL1_1Libs>
     <!-- Change the 8 components below if OpenSSLFileVersion changes -->
     <LibEay32Component>{44CCE5C8-6D2D-4DFB-8F34-155C49878440}</LibEay32Component>
     <SSlEay32Component>{EE848D64-DD0E-4A46-BA18-DB95C24E6E0C}</SSlEay32Component>

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