diff options
| author | Jose <jose@zeroc.com> | 2016-10-17 21:55:26 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-10-17 21:55:26 +0200 |
| commit | 0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42 (patch) | |
| tree | 3d559919e657febbb6810f319a0baa570e82ee3c /cpp/src/slice2py | |
| parent | Add support for JavaScript import/expor in generated code (diff) | |
| download | ice-0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42.tar.bz2 ice-0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42.tar.xz ice-0b0adc719345e42cc5a6cdf2e14ac23f4ff6bf42.zip | |
Update mcpp version for Windows
* Update windows builds to use mcpp-2.7.2.10.
* Fix Slice/unicodePath test script form Windows.
Diffstat (limited to 'cpp/src/slice2py')
| -rw-r--r-- | cpp/src/slice2py/msbuild/packages.config | 4 | ||||
| -rw-r--r-- | cpp/src/slice2py/msbuild/slice2py.vcxproj | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/cpp/src/slice2py/msbuild/packages.config b/cpp/src/slice2py/msbuild/packages.config index 88735dc0077..9a95568662e 100644 --- a/cpp/src/slice2py/msbuild/packages.config +++ b/cpp/src/slice2py/msbuild/packages.config @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> <packages> - <package id="mcpp.v120" version="2.7.2.9" targetFramework="native" /> - <package id="mcpp.v140" version="2.7.2.9" targetFramework="native" /> + <package id="mcpp.v120" version="2.7.2.10" targetFramework="native" /> + <package id="mcpp.v140" version="2.7.2.10" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2py/msbuild/slice2py.vcxproj b/cpp/src/slice2py/msbuild/slice2py.vcxproj index 40ab0c9e81b..a396df33fe4 100644 --- a/cpp/src/slice2py/msbuild/slice2py.vcxproj +++ b/cpp/src/slice2py/msbuild/slice2py.vcxproj @@ -114,14 +114,14 @@ </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <ImportGroup Label="ExtensionTargets"> - <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" /> - <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" /> </ImportGroup> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> <PropertyGroup> <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText> </PropertyGroup> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.9\build\native\mcpp.v140.targets'))" /> - <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.9\build\native\mcpp.v120.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.10\build\native\mcpp.v140.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.10\build\native\mcpp.v120.targets'))" /> </Target> </Project>
\ No newline at end of file |