summaryrefslogtreecommitdiffstats
path: root/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
diff options
context:
space:
mode:
authorHans Wennborg <hans@hanshq.net>2013-10-10 17:32:01 +0000
committerHans Wennborg <hans@hanshq.net>2013-10-10 17:32:01 +0000
commit4fa1eb0d0d8796dde9a5281826d3a8784fd0e9dd (patch)
treebaec456a3e54d2b473dfdda845814a64752ca6ef /llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
parentd2aa909462acf85c95c60e1d7b1515549eb98bca (diff)
downloadbcm5719-llvm-4fa1eb0d0d8796dde9a5281826d3a8784fd0e9dd.tar.gz
bcm5719-llvm-4fa1eb0d0d8796dde9a5281826d3a8784fd0e9dd.zip
Provide msbuild integration for vs2013.
Patch by Josh Samuel! llvm-svn: 192371
Diffstat (limited to 'llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in')
-rw-r--r--llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in b/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
index fce601132b6..a6ef4eafc58 100644
--- a/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
+++ b/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in
@@ -1,5 +1,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <Import Project="$(VCTargetsPath)\Platforms\$(Platform)\PlatformToolsets\@VS_VERSION@\Microsoft.Cpp.$(Platform).@VS_VERSION@.props"/>
+ <Import Project="$(VCTargetsPath)\Platforms\$(Platform)\PlatformToolsets\@VS_VERSION@\Microsoft.Cpp.$(Platform).@VS_VERSION@.props" Condition="Exists('$(VCTargetsPath)\Platforms\$(Platform)\PlatformToolsets\@VS_VERSION@\Microsoft.Cpp.$(Platform).@VS_VERSION@.props')"/>
+ <Import Project="$(VCTargetsPath)\Platforms\$(Platform)\PlatformToolsets\@VS_VERSION@\Toolset.props" Condition="Exists('$(VCTargetsPath)\Platforms\$(Platform)\PlatformToolsets\@VS_VERSION@\Toolset.props')"/>
<PropertyGroup>
<LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\@REG_KEY@)</LLVMInstallDir>
OpenPOWER on IntegriCloud