diff options
| author | Jose <jose@zeroc.com> | 2017-02-06 16:15:14 +0100 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-02-06 16:15:14 +0100 |
| commit | 99415c0a3c4d914a8a85525ac6ce34a8faf9a8d0 (patch) | |
| tree | a1e7c202750a45719831fe61c100e7079f2eec91 /cpp/src/slice2cpp | |
| parent | Fixed ICE-7531 - ValueFactoryManager segfault (diff) | |
| download | ice-99415c0a3c4d914a8a85525ac6ce34a8faf9a8d0.tar.bz2 ice-99415c0a3c4d914a8a85525ac6ce34a8faf9a8d0.tar.xz ice-99415c0a3c4d914a8a85525ac6ce34a8faf9a8d0.zip | |
Add support for build with VS 2017 RC
Diffstat (limited to 'cpp/src/slice2cpp')
| -rw-r--r-- | cpp/src/slice2cpp/msbuild/packages.config | 1 | ||||
| -rw-r--r-- | cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/slice2cpp/msbuild/packages.config b/cpp/src/slice2cpp/msbuild/packages.config index 597bcabd211..3843006e3cd 100644 --- a/cpp/src/slice2cpp/msbuild/packages.config +++ b/cpp/src/slice2cpp/msbuild/packages.config @@ -2,4 +2,5 @@ <packages> <package id="mcpp.v120" version="2.7.2.12" targetFramework="native" /> <package id="mcpp.v140" version="2.7.2.12" targetFramework="native" /> + <package id="mcpp.v141" version="2.7.2.12" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj index 3153cc49f2f..4aa00013aa6 100644 --- a/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj +++ b/cpp/src/slice2cpp/msbuild/slice2cpp.vcxproj @@ -124,6 +124,7 @@ <ImportGroup Label="ExtensionTargets"> <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> @@ -131,6 +132,7 @@ </PropertyGroup> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.12\build\native\mcpp.v120.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.12\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.12\build\native\mcpp.v141.targets'))" /> </Target> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\config\ice.sign.targets" /> </Project>
\ No newline at end of file |