diff options
| author | Jose <jose@zeroc.com> | 2016-06-24 13:01:30 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-06-24 13:01:30 +0200 |
| commit | 0bbd752086b73bf60e393f6f797b68210b8708d0 (patch) | |
| tree | 88120c92fba64ab47262fbca4ed3989429c8b0f1 /cpp | |
| parent | C++11 proxy generation cleanup (diff) | |
| download | ice-0bbd752086b73bf60e393f6f797b68210b8708d0.tar.bz2 ice-0bbd752086b73bf60e393f6f797b68210b8708d0.tar.xz ice-0bbd752086b73bf60e393f6f797b68210b8708d0.zip | |
Fix (ICE-7199) - C++11 Ice\custom fails on Visual Studio 2015
Diffstat (limited to 'cpp')
| -rw-r--r-- | cpp/msbuild/ice.test.sln | 30 |
1 files changed, 21 insertions, 9 deletions
diff --git a/cpp/msbuild/ice.test.sln b/cpp/msbuild/ice.test.sln index fb81ed52fce..81b83a5bbab 100644 --- a/cpp/msbuild/ice.test.sln +++ b/cpp/msbuild/ice.test.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.24720.0 +VisualStudioVersion = 14.0.25123.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "client", "..\test\Ice\acm\msbuild\client\client.vcxproj", "{CD25A05C-228D-473F-A86F-6C2DD22085B4}" ProjectSection(ProjectDependencies) = postProject @@ -3273,8 +3273,11 @@ Global {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 - {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.ActiveCfg = Release|x64 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.ActiveCfg = Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|Win32.Build.0 = Debug|Win32 {B980C392-C4B2-4A3F-9AE2-5038FD607F74}.Debug|x64.ActiveCfg = Debug|x64 @@ -3286,8 +3289,11 @@ Global {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 - {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.ActiveCfg = Release|x64 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.ActiveCfg = Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|Win32.Build.0 = Debug|Win32 {F2D3FF79-D986-49A9-B6ED-DF39ECE4ABE4}.Debug|x64.ActiveCfg = Debug|x64 @@ -3299,8 +3305,11 @@ Global {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 - {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.ActiveCfg = Release|x64 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.ActiveCfg = Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|Win32.Build.0 = Debug|Win32 {C2BA933C-9EBE-44CB-A85F-5B5ED6F82442}.Debug|x64.ActiveCfg = Debug|x64 @@ -3312,8 +3321,11 @@ Global {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.ActiveCfg = Cpp11-Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|Win32.Build.0 = Cpp11-Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.ActiveCfg = Cpp11-Debug|x64 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.ActiveCfg = Release|Win32 - {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.ActiveCfg = Release|x64 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Debug|x64.Build.0 = Cpp11-Debug|x64 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.ActiveCfg = Cpp11-Release|Win32 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|Win32.Build.0 = Cpp11-Release|Win32 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.ActiveCfg = Cpp11-Release|x64 + {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Cpp11-Release|x64.Build.0 = Cpp11-Release|x64 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.ActiveCfg = Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|Win32.Build.0 = Debug|Win32 {ACFD09A4-49FE-45B5-A3CC-948968239C3E}.Debug|x64.ActiveCfg = Debug|x64 |