diff options
| author | Andrew Dunstan <andrew@dunslane.net> | 2017-06-05 14:24:42 -0400 |
|---|---|---|
| committer | Andrew Dunstan <andrew@dunslane.net> | 2017-06-05 14:28:26 -0400 |
| commit | 307fc49d5c02ee895f7da1ca442e6ecf53deeac6 (patch) | |
| tree | 345151cd046e73c20bce16b8f1c6ad18f5980909 | |
| parent | 894ce0e97ab1211d07f2b9630ea1b1139734cda8 (diff) | |
| download | postgresql-307fc49d5c02ee895f7da1ca442e6ecf53deeac6.tar.gz postgresql-307fc49d5c02ee895f7da1ca442e6ecf53deeac6.zip | |
Find openssl lib files in right directory for MSVC
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.
| -rw-r--r-- | src/tools/msvc/Solution.pm | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm index 0af4a525529..ddf874aadce 100644 --- a/src/tools/msvc/Solution.pm +++ b/src/tools/msvc/Solution.pm @@ -500,10 +500,20 @@ sub AddProject if ($self->{options}->{openssl}) { $proj->AddIncludeDir($self->{options}->{openssl} . '\include'); - $proj->AddLibrary( - $self->{options}->{openssl} . '\lib\VC\ssleay32.lib', 1); - $proj->AddLibrary( - $self->{options}->{openssl} . '\lib\VC\libeay32.lib', 1); + if (-e "$self->{options}->{openssl}/lib/VC/ssleayMD.lib") + { + $proj->AddLibrary( + $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}) { |