diff options
| author | Hans Wennborg <hans@hanshq.net> | 2013-10-10 17:32:01 +0000 |
|---|---|---|
| committer | Hans Wennborg <hans@hanshq.net> | 2013-10-10 17:32:01 +0000 |
| commit | a7d9a5d64a89ef8532fcf38cc8a57960d48e283e (patch) | |
| tree | 0722121c4468bed273509f965e3e2cb1d35ef170 /tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in | |
| parent | 6a24c7d4e78ade068e60cbb95adb5021014ba0b7 (diff) | |
| download | llvm-a7d9a5d64a89ef8532fcf38cc8a57960d48e283e.tar.gz llvm-a7d9a5d64a89ef8532fcf38cc8a57960d48e283e.tar.bz2 llvm-a7d9a5d64a89ef8532fcf38cc8a57960d48e283e.tar.xz | |
Provide msbuild integration for vs2013.
Patch by Josh Samuel!
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@192371 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in')
| -rw-r--r-- | tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in index fce601132b..a6ef4eafc5 100644 --- a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props.in +++ b/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>
|