postgres.git / summary / log / commit / refs

commit    0fde390f64fef6cf2dbbec18eba57fd804e172cf
Author:   Andrew Dunstan <andrew@dunslane.net>
Date:     Mon Jun 05 18:24:42 2017 +0000

    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.


 src/tools/msvc/Solution.pm | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 2cc69ce1c82..c45999bad10 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -496,10 +496,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})
 	{


[parent: 7d5891f5db71]