mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-03 06:49:02 +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
41 lines
1.8 KiB
Diff
41 lines
1.8 KiB
Diff
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
|
|
index 99f39caa5..21b5559d6 100644
|
|
--- a/src/tools/msvc/Mkvcbuild.pm
|
|
+++ b/src/tools/msvc/Mkvcbuild.pm
|
|
@@ -494,14 +494,15 @@ sub mkvcbuild
|
|
|
|
# Attempt to get python version and location.
|
|
# Assume python.exe in specified dir.
|
|
- my $pythonprog = "import sys;print(sys.prefix);"
|
|
- . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
|
|
- my $prefixcmd =
|
|
- $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
|
|
- my $pyout = `$prefixcmd`;
|
|
- die "Could not query for python version!\n" if $?;
|
|
- my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
|
|
-
|
|
+ #my $pythonprog = "import sys;print(sys.prefix);"
|
|
+ # . "print(str(sys.version_info[0])+str(sys.version_info[1]))";
|
|
+ #my $prefixcmd =
|
|
+ # $solution->{options}->{python} . "\\python -c \"$pythonprog\"";
|
|
+ #my $pyout = `$prefixcmd`;
|
|
+ #die "Could not query for python version!\n" if $?;
|
|
+ #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout);
|
|
+ my $pyprefix = $solution->{options}->{python};
|
|
+ my $pyver = 37;
|
|
# Sometimes (always?) if python is not present, the execution
|
|
# appears to work, but gives no data...
|
|
die "Failed to query python for version information\n"
|
|
@@ -510,8 +511,9 @@ sub mkvcbuild
|
|
my $pymajorver = substr($pyver, 0, 1);
|
|
my $plpython = $solution->AddProject('plpython' . $pymajorver,
|
|
'dll', 'PLs', 'src/pl/plpython');
|
|
- $plpython->AddIncludeDir($pyprefix . '/include');
|
|
- $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib");
|
|
+ $plpython->AddIncludeDir($pyprefix . '/include/python3.7');
|
|
+ $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly!
|
|
+ $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib");
|
|
$plpython->AddReference($postgres);
|
|
|
|
# Add transform modules dependent on plpython
|