diff options
| author | Jose <jose@zeroc.com> | 2019-06-04 19:37:35 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2019-06-04 19:37:35 +0200 |
| commit | 846ebfd2ed1cc8cddd51b107a7261c9647691446 (patch) | |
| tree | bd9e31d371de1b891c1ecf2777f9494037a379ae /cpp/src/slice2objc | |
| parent | Fix bogus loop in IceGrid/Activator #403 (diff) | |
| download | ice-846ebfd2ed1cc8cddd51b107a7261c9647691446.tar.bz2 ice-846ebfd2ed1cc8cddd51b107a7261c9647691446.tar.xz ice-846ebfd2ed1cc8cddd51b107a7261c9647691446.zip | |
Visual Studio 2019 build fixes
Diffstat (limited to 'cpp/src/slice2objc')
| -rw-r--r-- | cpp/src/slice2objc/msbuild/packages.config | 1 | ||||
| -rw-r--r-- | cpp/src/slice2objc/msbuild/slice2objc.vcxproj | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/cpp/src/slice2objc/msbuild/packages.config b/cpp/src/slice2objc/msbuild/packages.config index 8386dfda383..f32d6075d02 100644 --- a/cpp/src/slice2objc/msbuild/packages.config +++ b/cpp/src/slice2objc/msbuild/packages.config @@ -4,4 +4,5 @@ <package id="mcpp.v120" version="2.7.2.17" targetFramework="native" /> <package id="mcpp.v140" version="2.7.2.17" targetFramework="native" /> <package id="mcpp.v141" version="2.7.2.17" targetFramework="native" /> + <package id="mcpp.v142" version="2.7.2.17" targetFramework="native" /> </packages>
\ No newline at end of file diff --git a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj index 85d77e382e9..31b52518d9d 100644 --- a/cpp/src/slice2objc/msbuild/slice2objc.vcxproj +++ b/cpp/src/slice2objc/msbuild/slice2objc.vcxproj @@ -133,6 +133,7 @@ <Import Project="..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" /> <Import Project="..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" /> + <Import Project="..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets" Condition="Exists('..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets')" /> </ImportGroup> <Import Project="$(MSBuildThisFileDirectory)..\..\..\msbuild\ice.sign.targets" /> <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> @@ -143,5 +144,6 @@ <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v120.2.7.2.17\build\native\mcpp.v120.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v140.2.7.2.17\build\native\mcpp.v140.targets'))" /> <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v141.2.7.2.17\build\native\mcpp.v141.targets'))" /> + <Error Condition="!Exists('..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\msbuild\packages\mcpp.v142.2.7.2.17\build\native\mcpp.v142.targets'))" /> </Target> </Project>
\ No newline at end of file |