summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenoit Foucher <benoit@zeroc.com>2017-01-11 08:21:31 +0100
committerBenoit Foucher <benoit@zeroc.com>2017-01-11 08:21:31 +0100
commit56fb1a320298dd645e70825c8efa63b0034ab60c (patch)
tree8ce517f5dfe0be2dbf7f037b8609e7c17b41609b
parentExport BasicStringConverter template instantiations (ICE-7473) (diff)
downloadice-56fb1a320298dd645e70825c8efa63b0034ab60c.tar.bz2
ice-56fb1a320298dd645e70825c8efa63b0034ab60c.tar.xz
ice-56fb1a320298dd645e70825c8efa63b0034ab60c.zip
Fixed metrics client project to only set -d2SSAOptimizer- for VS2015
-rw-r--r--cpp/test/Ice/metrics/msbuild/client/client.vcxproj4
1 files changed, 2 insertions, 2 deletions
diff --git a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj
index bcae972a131..86845044a5e 100644
--- a/cpp/test/Ice/metrics/msbuild/client/client.vcxproj
+++ b/cpp/test/Ice/metrics/msbuild/client/client.vcxproj
@@ -129,7 +129,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalOptions>/bigobj -d2SSAOptimizer- %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(DefaultPlatformToolset)'=='v140'">/bigobj -d2SSAOptimizer- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'">
@@ -150,7 +150,7 @@
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
<ClCompile>
<AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
- <AdditionalOptions>/bigobj -d2SSAOptimizer- %(AdditionalOptions)</AdditionalOptions>
+ <AdditionalOptions Condition="'$(DefaultPlatformToolset)'=='v140'">/bigobj -d2SSAOptimizer- %(AdditionalOptions)</AdditionalOptions>
</ClCompile>
</ItemDefinitionGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'">