summaryrefslogtreecommitdiff
path: root/tools/msbuild
diff options
context:
space:
mode:
authorReid Kleckner <reid@kleckner.net>2013-08-27 23:07:17 +0000
committerReid Kleckner <reid@kleckner.net>2013-08-27 23:07:17 +0000
commit22d6eb8ca91f4ce8db6a9ce8e2663502ebcee0c2 (patch)
tree77d122b07afc5d01225a34a77bb752e15727bfdd /tools/msbuild
parent23f84cb1406b0f26f5bd808afa1828d427a40a2f (diff)
downloadllvm-22d6eb8ca91f4ce8db6a9ce8e2663502ebcee0c2.tar.gz
llvm-22d6eb8ca91f4ce8db6a9ce8e2663502ebcee0c2.tar.bz2
llvm-22d6eb8ca91f4ce8db6a9ce8e2663502ebcee0c2.tar.xz
Add xml files for msbuild integration
These files are intended to live in the msbuild toolset directory, which is somewhere like: C:\Program Files (x86)\MSBuild\Microsoft.Cpp\ v4.0\Platforms\Win32\PlatformToolsets\llvm More work is needed to install them as part of the NSIS installer. Patch by Warren Hunt! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@189411 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools/msbuild')
-rw-r--r--tools/msbuild/Microsoft.Cpp.Win32.llvm.props10
-rw-r--r--tools/msbuild/Microsoft.Cpp.Win32.llvm.targets2
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/msbuild/Microsoft.Cpp.Win32.llvm.props b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props
new file mode 100644
index 0000000000..68dfa24210
--- /dev/null
+++ b/tools/msbuild/Microsoft.Cpp.Win32.llvm.props
@@ -0,0 +1,10 @@
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <VCInstallDir>suppress warning</VCInstallDir>
+ <WindowsSdkDir>suppress warning</WindowsSdkDir>
+
+ <ClangInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM 3.4.svn)</ClangInstallDir>
+ <ClangInstallDir Condition="'$(ClangInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM 3.4.svn)</ClangInstallDir>
+ <ExecutablePath>$(ClangInstallDir)\msbuild-bin;$(ExecutablePath)</ExecutablePath>
+ </PropertyGroup>
+</Project>
diff --git a/tools/msbuild/Microsoft.Cpp.Win32.llvm.targets b/tools/msbuild/Microsoft.Cpp.Win32.llvm.targets
new file mode 100644
index 0000000000..df41a844aa
--- /dev/null
+++ b/tools/msbuild/Microsoft.Cpp.Win32.llvm.targets
@@ -0,0 +1,2 @@
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+</Project>