summaryrefslogtreecommitdiff
path: root/cpp/src/IceGridLib
diff options
context:
space:
mode:
authorBernard Normier <bernard@zeroc.com>2016-05-11 17:50:09 -0400
committerBernard Normier <bernard@zeroc.com>2016-05-11 17:50:09 -0400
commitff76da01915482dc5c5bcc693789642882958d64 (patch)
treeb57639e7490f850fbec23c50f159c408689234e5 /cpp/src/IceGridLib
parentcleaning up stream API in C++/Java/JS (diff)
downloadice-ff76da01915482dc5c5bcc693789642882958d64.tar.bz2
ice-ff76da01915482dc5c5bcc693789642882958d64.tar.xz
ice-ff76da01915482dc5c5bcc693789642882958d64.zip
IceUtil and Slice msbuild updates
Diffstat (limited to 'cpp/src/IceGridLib')
-rw-r--r--cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj8
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
index 9edf4c62c57..6e0bcb71b16 100644
--- a/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
+++ b/cpp/src/IceGridLib/msbuild/icegriduwp++11/icegriduwp++11.vcxproj
@@ -35,6 +35,8 @@
<WindowsTargetPlatformVersion>10.0.10586.0</WindowsTargetPlatformVersion>
<WindowsTargetPlatformMinVersion>10.0.10240.0</WindowsTargetPlatformMinVersion>
<ApplicationTypeRevision>10.0</ApplicationTypeRevision>
+ <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">
@@ -70,7 +72,7 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<Import Project="$(MSBuildThisFileDirectory)\..\..\..\..\msbuild\ice.uwp.props" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.props" />
+ <Import Project="$(IceBuilderCppProps)" Condition="Exists('$(IceBuilderCppProps)')" />
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
@@ -816,7 +818,7 @@
</ClInclude>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
- <Import Project="$(LOCALAPPDATA)\ZeroC\IceBuilder\IceBuilder.Cpp.targets" />
+ <Import Project="$(IceBuilderCppTargets)" Condition="Exists('$(IceBuilderCppTargets)')" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
-</Project>
+</Project> \ No newline at end of file