mirrors/postgres
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Find openssl lib files in right directory for MSVC

Browse Source 
Some openssl builds put their lib files in a VC subdirectory, others do
not. Cater for both cases.

Backpatch to all live branches.

From an offline discussion with Leonardo Cecchi.
This commit is contained in:
Andrew Dunstan 2017-06-05 14:24:42 -04:00
parent d466335064
commit 614350a3ab
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/tools/msvc/Solution.pm
View File

@ -523,10 +523,20 @@ sub AddProject
if ($self->{options}->{openssl}) if ($self->{options}->{openssl})
{ {
$proj->AddIncludeDir($self->{options}->{openssl} . '\include'); $proj->AddIncludeDir($self->{options}->{openssl} . '\include');
$proj->AddLibrary( if (-e "$self->{options}->{openssl}/lib/VC/ssleayMD.lib")
$self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); {
$proj->AddLibrary( $proj->AddLibrary(
$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1);
$proj->AddLibrary(
$self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1);
}
else
{
$proj->AddLibrary(
$self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
$proj->AddLibrary(
$self->{options}->{openssl} . '\lib\libeay32.lib', 1);
}
} }
if ($self->{options}->{nls}) if ($self->{options}->{nls})
{ {