mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-27 14:07:56 +08:00
6b871df7e0
* fix number of spaces in string replacement * fix libiconv library name * [libpq] update to 12.2 fix some issues with features feature combination client+nls does not compile with latest VS due to libpq src's accessing an implementation detail (needs upstream fix) * on arm skip host openssl version check if host cannot execute the triplet version * use PORT_VERSION to update the version references more easily * fix tcl and python feature on windows
39 lines
1.1 KiB
Diff
39 lines
1.1 KiB
Diff
diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
|
|
index 25a549015..9018270ab 100644
|
|
--- a/src/tools/msvc/Solution.pm
|
|
+++ b/src/tools/msvc/Solution.pm
|
|
@@ -132,21 +132,21 @@ sub GetOpenSSLVersion
|
|
# Attempt to get OpenSSL version and location. This assumes that
|
|
# openssl.exe is in the specified directory.
|
|
# Quote the .exe name in case it has spaces
|
|
- my $opensslcmd =
|
|
- qq("openssl.exe" version 2>&1);
|
|
- my $sslout = `$opensslcmd`;
|
|
+ #my $opensslcmd =
|
|
+ # qq("openssl.exe" version 2>&1);
|
|
+ #my $sslout = `$opensslcmd`;
|
|
|
|
- $? >> 8 == 0
|
|
- or croak
|
|
- "Unable to determine OpenSSL version: The openssl.exe command wasn't found.";
|
|
+ #$? >> 8 == 0
|
|
+ # or croak
|
|
+ # "Unable to determine OpenSSL version: The openssl.exe command wasn't found.";
|
|
|
|
- if ($sslout =~ /(\d+)\.(\d+)\.(\d+)(\D)/m)
|
|
- {
|
|
- return ($1, $2, $3);
|
|
- }
|
|
+ #if ($sslout =~ /(\d+)\.(\d+)\.(\d+)(\D)/m)
|
|
+ #{
|
|
+ return (1, 1, 1);
|
|
+ #}
|
|
|
|
- croak
|
|
- "Unable to determine OpenSSL version: The openssl.exe version could not be determined.";
|
|
+ #croak
|
|
+ # "Unable to determine OpenSSL version: The openssl.exe version could not be determined.";
|
|
}
|
|
|
|
sub GenerateFiles
|