diff options
| author | Jose <jose@zeroc.com> | 2017-07-11 13:24:23 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-07-11 13:24:23 +0200 |
| commit | 39c3e1e4151bb2ff533ef91be555686d99737025 (patch) | |
| tree | 2bdcfb20c6d56df88d14e8881c6954fcc57b1fee /cpp/test/Ice/proxy | |
| parent | Fix for ICE-8245 - Python Ice/exceptions hang (diff) | |
| download | ice-39c3e1e4151bb2ff533ef91be555686d99737025.tar.bz2 ice-39c3e1e4151bb2ff533ef91be555686d99737025.tar.xz ice-39c3e1e4151bb2ff533ef91be555686d99737025.zip | |
Remove bogus preprocessor defintions in Windows test builds
Diffstat (limited to 'cpp/test/Ice/proxy')
| -rw-r--r-- | cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj | 8 | ||||
| -rw-r--r-- | cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj | 6 |
2 files changed, 0 insertions, 14 deletions
diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index 8315f08337d..58a4201203f 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -125,49 +125,41 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Cpp11-Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> diff --git a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj index d7ff54e5984..aee6fda08be 100644 --- a/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/uwp/serveramd/serveramd.vcxproj @@ -124,37 +124,31 @@ <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'"> <ClCompile> <AdditionalIncludeDirectories>..\..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>ICE_AMD_TEST;%(PreprocessorDefinitions)</PreprocessorDefinitions> </ClCompile> </ItemDefinitionGroup> <ItemGroup> |