projects / ceph.git / blame
| Commit | Line | Data |
|---|---|---|
| 1e59de90 TL |
1 | diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm |
| 2 | index 99f39caa5..21b5559d6 100644 | |
| 3 | --- a/src/tools/msvc/Mkvcbuild.pm | |
| 4 | +++ b/src/tools/msvc/Mkvcbuild.pm | |
| 5 | @@ -494,14 +494,15 @@ sub mkvcbuild | |
| 6 | ||
| 7 | # Attempt to get python version and location. | |
| 8 | # Assume python.exe in specified dir. | |
| 9 | - my $pythonprog = "import sys;print(sys.prefix);" | |
| 10 | - . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; | |
| 11 | - my $prefixcmd = | |
| 12 | - $solution->{options}->{python} . "\\python -c \"$pythonprog\""; | |
| 13 | - my $pyout = `$prefixcmd`; | |
| 14 | - die "Could not query for python version!\n" if $?; | |
| 15 | - my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); | |
| 16 | - | |
| 17 | + #my $pythonprog = "import sys;print(sys.prefix);" | |
| 18 | + # . "print(str(sys.version_info[0])+str(sys.version_info[1]))"; | |
| 19 | + #my $prefixcmd = | |
| 20 | + # $solution->{options}->{python} . "\\python -c \"$pythonprog\""; | |
| 21 | + #my $pyout = `$prefixcmd`; | |
| 22 | + #die "Could not query for python version!\n" if $?; | |
| 23 | + #my ($pyprefix, $pyver) = split(/\r?\n/, $pyout); | |
| 24 | + my $pyprefix = $solution->{options}->{python}; | |
| 25 | + my $pyver = 39; | |
| 26 | # Sometimes (always?) if python is not present, the execution | |
| 27 | # appears to work, but gives no data... | |
| 28 | die "Failed to query python for version information\n" | |
| 29 | @@ -510,8 +511,9 @@ sub mkvcbuild | |
| 30 | my $pymajorver = substr($pyver, 0, 1); | |
| 31 | my $plpython = $solution->AddProject('plpython' . $pymajorver, | |
| 32 | 'dll', 'PLs', 'src/pl/plpython'); | |
| 33 | - $plpython->AddIncludeDir($pyprefix . '/include'); | |
| 34 | - $plpython->AddLibrary($pyprefix . "/Libs/python$pyver.lib"); | |
| 35 | + $plpython->AddIncludeDir($pyprefix . '/include/python3.9'); | |
| 36 | + $plpython->AddDefine('_DEBUG'); # required for python autolink linking correctly! | |
| 37 | + $plpython->AddLibrary($pyprefix . "/debug/lib/python$pyver" . "_d.lib"); | |
| 38 | $plpython->AddReference($postgres); | |
| 39 | ||
| 40 | # Add transform modules dependent on plpython |