diff options
| author | Jose <jose@zeroc.com> | 2017-04-11 16:51:14 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-04-11 16:51:14 +0200 |
| commit | bb5fd04825801adfc4a9ff9bf86cf752b9cd63d7 (patch) | |
| tree | f7b6cf387b25c4caa85e85a45369dd18cc77cbae /cpp | |
| parent | UWP Nuget package property updates (diff) | |
| download | ice-bb5fd04825801adfc4a9ff9bf86cf752b9cd63d7.tar.bz2 ice-bb5fd04825801adfc4a9ff9bf86cf752b9cd63d7.tar.xz ice-bb5fd04825801adfc4a9ff9bf86cf752b9cd63d7.zip | |
Missing Ice_Configuration property in UWP Nuget packages
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/msbuild/zeroc.ice.uwp.v140.targets | 6 | ||||
| -rw-r--r-- | cpp/msbuild/zeroc.ice.uwp.v141.targets | 5 |
2 files changed, 11 insertions, 0 deletions
diff --git a/cpp/msbuild/zeroc.ice.uwp.v140.targets b/cpp/msbuild/zeroc.ice.uwp.v140.targets index 1ceeddbc9a4..b2325349c4e 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v140.targets +++ b/cpp/msbuild/zeroc.ice.uwp.v140.targets @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + + <PropertyGroup Condition="'$(PlatformToolset)' == 'v140'"> + <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> + <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v140'"> <ClCompile> <AdditionalIncludeDirectories>$(IceHome)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> diff --git a/cpp/msbuild/zeroc.ice.uwp.v141.targets b/cpp/msbuild/zeroc.ice.uwp.v141.targets index 9b0914895dd..9e4b239baac 100644 --- a/cpp/msbuild/zeroc.ice.uwp.v141.targets +++ b/cpp/msbuild/zeroc.ice.uwp.v141.targets @@ -1,5 +1,10 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <PropertyGroup Condition="'$(PlatformToolset)' == 'v141'"> + <Ice_Configuration Condition="'$(UseDebugLibraries)' == 'true'">Debug</Ice_Configuration> + <Ice_Configuration Condition="'$(UseDebugLibraries)' != 'true'">Release</Ice_Configuration> + </PropertyGroup> + <ItemDefinitionGroup Condition="'$(PlatformToolset)' == 'v141'"> <ClCompile> <AdditionalIncludeDirectories>$(IceHome)\build\native\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> |