diff options
| author | Jose <jose@zeroc.com> | 2017-03-27 16:29:15 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-03-27 16:29:15 +0200 |
| commit | bd1433e3cf77fe84d58085e44f1158d5cc26c23c (patch) | |
| tree | 5bb2e845ff58ba6e8ba225a485865ecb6b95c24c | |
| parent | Fixed (ICE-7709) - Python memory allocator called without holding the GIL (diff) | |
| download | ice-bd1433e3cf77fe84d58085e44f1158d5cc26c23c.tar.bz2 ice-bd1433e3cf77fe84d58085e44f1158d5cc26c23c.tar.xz ice-bd1433e3cf77fe84d58085e44f1158d5cc26c23c.zip | |
Fix to build Python extension in Debug mode on Windows
| -rw-r--r-- | python/config/Ice.Python.props | 5 | ||||
| -rw-r--r-- | python/msbuild/ice.proj | 38 |
2 files changed, 13 insertions, 30 deletions
diff --git a/python/config/Ice.Python.props b/python/config/Ice.Python.props index 3a617ef81e4..51908970e9a 100644 --- a/python/config/Ice.Python.props +++ b/python/config/Ice.Python.props @@ -3,5 +3,10 @@ <PropertyGroup Condition="'$(Configuration)' == ''"> <Configuration>Debug</Configuration> </PropertyGroup> + + <PropertyGroup Condition="'$(Configuration)' == 'Debug'"> + <UseDebugLibraries>true</UseDebugLibraries> + </PropertyGroup> + <Import Project="$(MSBuildThisFileDirectory)..\..\cpp\config\ice.cpp.props" /> </Project> diff --git a/python/msbuild/ice.proj b/python/msbuild/ice.proj index c7974915aac..f87975a9170 100644 --- a/python/msbuild/ice.proj +++ b/python/msbuild/ice.proj @@ -14,37 +14,15 @@ <Exec Command="$(NugetExe) restore $(MSBuildThisFileDirectory)ice.sln"/> </Target> - <Choose> - <!-- - If BuildAllConfigurations is set to yes we build all configurations that are - part of the binary distribution, otherwise we just build the specific platform - and configuration. - --> - <When Condition="'$(BuildAllConfigurations)' == 'yes'"> - <ItemGroup> - <DistProjects Include="ice.sln"> - <Properties>Configuration=Release;Platform=Win32</Properties> - </DistProjects> - <DistProjects Include="ice.sln"> - <Properties>Configuration=Release;Platform=x64</Properties> - </DistProjects> - <DistProjects Include="..\python\**\msbuild\*.proj"> - <Properties>Configuration=Release;Platform=Win32</Properties> - </DistProjects> - </ItemGroup> - </When> - <Otherwise> - <ItemGroup> - <DistProjects Include="ice.sln"> - <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties> - </DistProjects> + <ItemGroup> + <DistProjects Include="ice.sln"> + <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties> + </DistProjects> - <DistProjects Include="..\python\**\msbuild\*.proj"> - <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties> - </DistProjects> - </ItemGroup> - </Otherwise> - </Choose> + <DistProjects Include="..\python\**\msbuild\*.proj"> + <Properties>Configuration=$(Configuration);Platform=$(Platform)</Properties> + </DistProjects> + </ItemGroup> <Target Name="Build" DependsOnTargets="NugetRestore"> <MSBuild Projects="@(DistProjects)" |