summaryrefslogtreecommitdiff
path: root/cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj
diff options
context:
space:
mode:
Diffstat (limited to 'cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj')
-rw-r--r--cpp/test/Ice/proxy/msbuild/collocated/collocated.vcxproj8
1 files changed, 5 insertions, 3 deletions
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