diff options
| author | Jose <jose@zeroc.com> | 2017-06-30 13:31:34 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2017-06-30 13:31:34 +0200 |
| commit | 993b5a68e7e8eb50ee359b00bd723c69013ce627 (patch) | |
| tree | f756d6f006597032c581a7ac03650518c98f8a59 /cpp/src | |
| parent | ICE-8192 - another fix for GeneratedCodeAttribute (diff) | |
| download | ice-993b5a68e7e8eb50ee359b00bd723c69013ce627.tar.bz2 ice-993b5a68e7e8eb50ee359b00bd723c69013ce627.tar.xz ice-993b5a68e7e8eb50ee359b00bd723c69013ce627.zip | |
Fix (ICE-8186) - msbuild rebuilds to often the C# sources
Diffstat (limited to 'cpp/src')
9 files changed, 29 insertions, 29 deletions
diff --git a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters index d83819a2171..50d62a9bcd5 100644 --- a/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters +++ b/cpp/src/IceBox/msbuild/iceboxadmin/iceboxadmin.vcxproj.filters @@ -12,11 +12,13 @@ </Filter> </ItemGroup> <ItemGroup> - <ResourceCompile Include="..\..\IceBoxAdmin.rc" /> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\..\Admin.cpp"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> + <ItemGroup> + <ResourceCompile Include="..\..\IceBoxAdmin.rc"> + <Filter>Resource Files</Filter> + </ResourceCompile> + </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/IceBridge/msbuild/icebridge.vcxproj.filters b/cpp/src/IceBridge/msbuild/icebridge.vcxproj.filters index 4f26389c153..a3e18ff48fc 100644 --- a/cpp/src/IceBridge/msbuild/icebridge.vcxproj.filters +++ b/cpp/src/IceBridge/msbuild/icebridge.vcxproj.filters @@ -14,12 +14,12 @@ </ItemGroup> <ItemGroup> <ClCompile Include="..\IceBridge.cpp"> - <Filter>Slice Files</Filter> + <Filter>Source Files</Filter> </ClCompile> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\IceBridge.rc"> - <Filter>Source Files</Filter> + <Filter>Resource Files</Filter> </ResourceCompile> </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj index a535a8db915..5bae71862a0 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj @@ -137,7 +137,7 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> </ClInclude> - <ClInclude Include="..\..\PluginI.h" /> + <ClInclude Include="..\..\Plugin.h" /> </ItemGroup> <ItemGroup> <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice" /> diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters index 19884112c8f..1c019109cfa 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery++11/icelocatordiscovery++11.vcxproj.filters @@ -77,9 +77,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\PluginI.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -92,6 +89,9 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> + <ClInclude Include="..\..\Plugin.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <IceBuilder Include="..\..\..\..\..\slice\IceLocatorDiscovery\IceLocatorDiscovery.ice"> diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj index 26f1428c7ea..b1040a27b09 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj @@ -147,7 +147,7 @@ <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> </ClInclude> - <ClInclude Include="..\..\PluginI.h" /> + <ClInclude Include="..\..\Plugin.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> diff --git a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters index ff6ce73a383..22629a8783b 100644 --- a/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters +++ b/cpp/src/IceLocatorDiscovery/msbuild/icelocatordiscovery/icelocatordiscovery.vcxproj.filters @@ -77,9 +77,6 @@ </ClCompile> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\PluginI.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp98\Win32\Debug\IceLocatorDiscovery\IceLocatorDiscovery.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -92,6 +89,9 @@ <ClInclude Include="..\..\..\..\include\generated\cpp98\x64\Release\IceLocatorDiscovery\IceLocatorDiscovery.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> + <ClInclude Include="..\..\Plugin.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> <ItemGroup> <ResourceCompile Include="..\..\IceLocatorDiscovery.rc"> diff --git a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters index 19bdeb423ee..c50d2e4ed00 100644 --- a/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters +++ b/cpp/src/IceSSL/msbuild/icessl++11/icessl++11.vcxproj.filters @@ -199,12 +199,6 @@ <ClInclude Include="..\..\..\..\include\IceSSL\Plugin.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\SChannelEngine.h"> - <Filter>Source Files</Filter> - </ClInclude> - <ClInclude Include="..\..\SChannelEngineF.h"> - <Filter>Source Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\generated\cpp11\Win32\Debug\IceSSL\ConnectionInfoF.h"> <Filter>Header Files\Win32\Debug</Filter> </ClInclude> @@ -241,5 +235,11 @@ <ClInclude Include="..\..\..\..\include\generated\cpp11\x64\Release\IceSSL\EndpointInfo.h"> <Filter>Header Files\x64\Release</Filter> </ClInclude> + <ClInclude Include="..\..\SChannelEngine.h"> + <Filter>Header Files</Filter> + </ClInclude> + <ClInclude Include="..\..\SChannelEngineF.h"> + <Filter>Header Files</Filter> + </ClInclude> </ItemGroup> </Project>
\ No newline at end of file diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj index 41d7b94c690..e08c9a318f4 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj @@ -141,7 +141,6 @@ <ClInclude Include="..\..\..\..\include\IceUtil\RecMutex.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\ScannerConfig.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\StringConverter.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\StringUtil.h" /> @@ -150,7 +149,6 @@ <ClInclude Include="..\..\..\..\include\IceUtil\Time.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\Timer.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h" /> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h" /> <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h" /> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> diff --git a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters index a4000c5cfc3..56c31da12c9 100644 --- a/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters +++ b/cpp/src/IceUtil/msbuild/iceutil/iceutil.vcxproj.filters @@ -1,4 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> +<?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <ItemGroup> <Filter Include="Source Files"> @@ -60,6 +60,12 @@ <ClCompile Include="..\..\ConsoleUtil.cpp"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\ConvertUTF.cpp"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\Unicode.cpp"> + <Filter>Source Files</Filter> + </ClCompile> </ItemGroup> <ItemGroup> <ClInclude Include="..\..\..\..\include\IceUtil\Atomic.h"> @@ -146,9 +152,6 @@ <ClInclude Include="..\..\..\..\include\IceUtil\ScopedArray.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\SHA1.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\IceUtil\Shared.h"> <Filter>Header Files</Filter> </ClInclude> @@ -173,9 +176,6 @@ <ClInclude Include="..\..\..\..\include\IceUtil\UndefSysMacros.h"> <Filter>Header Files</Filter> </ClInclude> - <ClInclude Include="..\..\..\..\include\IceUtil\UniquePtr.h"> - <Filter>Header Files</Filter> - </ClInclude> <ClInclude Include="..\..\..\..\include\IceUtil\UUID.h"> <Filter>Header Files</Filter> </ClInclude> @@ -183,4 +183,4 @@ <Filter>Header Files</Filter> </ClInclude> </ItemGroup> -</Project> +</Project>
\ No newline at end of file |