diff options
| author | Warren Hunt <whunt@google.com> | 2013-08-28 22:54:13 +0000 |
|---|---|---|
| committer | Warren Hunt <whunt@google.com> | 2013-08-28 22:54:13 +0000 |
| commit | 42646d2f17aae6db80fecf4494361282fc374a78 (patch) | |
| tree | 582a8dfe35996b7061221e23fae5800cd8422c8d /llvm/tools | |
| parent | 54c3cbcefe49205dda6b5385d7c2c6ee31b31298 (diff) | |
| download | bcm5719-llvm-42646d2f17aae6db80fecf4494361282fc374a78.tar.gz bcm5719-llvm-42646d2f17aae6db80fecf4494361282fc374a78.zip | |
Adding VCIncludeDir and WindowsSDKDir to the msbuild configuration file. This allows clang to find windows.h and other files in the
sdk and visutal studio includes.
llvm-svn: 189528
Diffstat (limited to 'llvm/tools')
| -rw-r--r-- | llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props b/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props index 68dfa24210a..43164c920bd 100644 --- a/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props +++ b/llvm/tools/msbuild/Microsoft.Cpp.Win32.llvm.props @@ -1,10 +1,26 @@ <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
- <VCInstallDir>suppress warning</VCInstallDir>
- <WindowsSdkDir>suppress warning</WindowsSdkDir>
+ <VCInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\11.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\11.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\11.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\9.0\Setup\VC@ProductDir)</VCInstallDir>
+ <VCInstallDir Condition="'$(VCInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\9.0\Setup\VC@ProductDir)</VCInstallDir>
+
+ <WindowsSdkDir Condition="'$(UseEnv)' != 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows@CurrentInstallFolder)</WindowsSdkDir>
+ <WindowsSdkDir Condition="'$(WindowsSdkDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows@CurrentInstallFolder)</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>
+
+ <IncludePath Condition="'$(IncludePath)' == ''">$(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include</IncludePath>
+ <LibraryPath Condition="'$(LibraryPath)' == ''">$(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib</LibraryPath>
</PropertyGroup>
</Project>
|
