diff options
Diffstat (limited to 'cpp/test/Ice/slicing/exceptions')
3 files changed, 13 insertions, 7 deletions
diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj index ec4ff77e45a..c3a86b93abf 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/client/client.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{6476DBD1-9C4F-4107-8271-2B1DC2B535E5}</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"> @@ -413,5 +415,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/slicing/exceptions/msbuild/server/server.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj index 6f65bfbefdd..85c6f8c46fe 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/server/server.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{CFFE56E2-BBDE-4B6E-BB76-1A1A61453570}</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"> @@ -454,5 +456,5 @@ <IceBuilderIncludeDirectories>..\..\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file diff --git a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj index 3167cc8ede3..15129f0c585 100644 --- a/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj +++ b/cpp/test/Ice/slicing/exceptions/msbuild/serveramd/serveramd.vcxproj @@ -37,6 +37,8 @@ <PropertyGroup Label="Globals"> <ProjectGuid>{171056B8-17A5-4825-9110-2877A94CD933}</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"> @@ -462,5 +464,5 @@ <IceBuilderIncludeDirectories>..\..\;$(IceBuilderIncludeDirectories)</IceBuilderIncludeDirectories> </PropertyGroup> <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> - <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" /> + <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" /> </Project>
\ No newline at end of file |