diff options
| author | Jose <jose@zeroc.com> | 2016-05-05 21:07:19 +0200 |
|---|---|---|
| committer | Jose <jose@zeroc.com> | 2016-05-05 21:07:19 +0200 |
| commit | a6369e92aa8c9ee28fea1e6f7135c1db11cfa045 (patch) | |
| tree | 585f5d201203628f6b4766941abb086c11c9b4ac /cpp/test/Ice/proxy | |
| parent | Do not build iceboxadmin with C++11 (diff) | |
| download | ice-a6369e92aa8c9ee28fea1e6f7135c1db11cfa045.tar.bz2 ice-a6369e92aa8c9ee28fea1e6f7135c1db11cfa045.tar.xz ice-a6369e92aa8c9ee28fea1e6f7135c1db11cfa045.zip | |
Windows msbuild build updates
Diffstat (limited to 'cpp/test/Ice/proxy')
4 files changed, 20 insertions, 12 deletions
diff --git a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj index 0a709a08f69..8e3d69f05ba 100644 --- a/cpp/test/Ice/proxy/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/client/client.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{D0301B50-901B-4298-B8C8-B134A320E2A0}</ProjectGuid> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -81,7 +83,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -265,5 +267,5 @@ </ClInclude> </ItemGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> -</Project> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> +</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj index a8ecd576b17..4424dd892eb 100644 --- a/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{59ED55DD-0EF7-4028-B7DD-AFB6488155F6}</ProjectGuid> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -81,7 +83,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -307,5 +309,5 @@ </ItemGroup> <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> -</Project> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> +</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj index 6924bcd82a8..756236f711d 100644 --- a/cpp/test/Ice/proxy/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/server/server.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{2DAEF04A-7C9A-4C64-99E9-D0F503667FBF}</ProjectGuid> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -81,7 +83,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -306,5 +308,5 @@ </ItemGroup> <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> -</Project> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> +</Project>
\ No newline at end of file diff --git a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj index b1c9d219e04..d1f0f43641e 100644 --- a/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/proxy/msbuild/serveramd/serveramd.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{36CC0D35-FFFE-46D1-8EE1-1A3438DCC938}</ProjectGuid> <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion> + <IceBuilderCppProps Condition="!Exists('$(IceBuilderCppProps)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.props', SearchOption.AllDirectories))</IceBuilderCppProps> + <IceBuilderCppTargets Condition="!Exists('$(IceBuilderCppTargets)')">$([System.IO.Directory]::GetFiles('$(LocalAppData)\Microsoft\VisualStudio\$(VisualStudioVersion)\Extensions', 'IceBuilder.Cpp.targets', SearchOption.AllDirectories))</IceBuilderCppTargets> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" /> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration"> @@ -81,7 +83,7 @@ </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" /> <Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\..\msbuild\ice.test.props" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" /> + <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" /> <ImportGroup Label="ExtensionSettings"> </ImportGroup> <ImportGroup Label="Shared"> @@ -314,5 +316,5 @@ </ItemGroup> <PropertyGroup Label="UserMacros" /> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> -</Project> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> +</Project>
\ No newline at end of file |