[llvm] r189528 - Adding VCIncludeDir and WindowsSDKDir to the msbuild configuration file. This allows clang to find windows.h and other files in the

[Sean Silva]

Would it make more sense for these msbuild files to live in the clang tree?

-- Sean Silva


On Wed, Aug 28, 2013 at 6:54 PM, Warren Hunt <whunt at google.com> wrote:

> Author: whunt
> Date: Wed Aug 28 17:54:13 2013
> New Revision: 189528
>
> URL: http://llvm.org/viewvc/llvm-project?rev=189528&view=rev
> Log:
> 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.
>
>
> Modified:
>     llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props
>
> Modified: llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props
> URL:
> http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props?rev=189528&r1=189527&r2=189528&view=diff
>
> ==============================================================================
> --- llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props (original)
> +++ llvm/trunk/tools/msbuild/Microsoft.Cpp.Win32.llvm.props Wed Aug 28
> 17:54:13 2013
> @@ -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 at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\11.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\11.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\11.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\10.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\10.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\10.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\9.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VisualStudio\9.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VCExpress\9.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +    <VCInstallDir Condition="'$(VCInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\VCExpress\9.0\Setup\VC at ProductDir
> )</VCInstallDir>
> +
> +    <WindowsSdkDir Condition="'$(UseEnv)' !=
> 'true'">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft
> SDKs\Windows at CurrentInstallFolder)</WindowsSdkDir>
> +    <WindowsSdkDir Condition="'$(WindowsSdkDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft
> SDKs\Windows at 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>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at cs.uiuc.edu
> http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20130829/efcca354/attachment.html>