[PATCH] D50335: vs integration: fix default path to clang-cl

[Zachary Turner via llvm-commits]

I’m OOO this week so I can’t easily check this stuff. Sorry for all the
questions. The registry key that we create, is it the (Default) value or is
it a string value named LLVM?
On Mon, Aug 6, 2018 at 11:08 AM Hans Wennborg via Phabricator <
reviews at reviews.llvm.org> wrote:

> hans updated this revision to Diff 159307.
> hans added a comment.
>
> Make LLVMInstallDir include a trailing backslash.
>
>
> https://reviews.llvm.org/D50335
>
> Files:
>   tools/msbuild/LLVM.Cpp.Common.props
>
>
> Index: tools/msbuild/LLVM.Cpp.Common.props
> ===================================================================
> --- tools/msbuild/LLVM.Cpp.Common.props
> +++ tools/msbuild/LLVM.Cpp.Common.props
> @@ -37,8 +37,9 @@
>
>    <!-- Find an installed LLVM and set up our paths. -->
>    <PropertyGroup>
> -    <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM at LLVM
> )</LLVMInstallDir>
> -    <LLVMInstallDir Condition="'$(LLVMInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM at LLVM
> )</LLVMInstallDir>
> +
> <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
> +    <LLVMInstallDir Condition="'$(LLVMInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
> +    <LLVMInstallDir Condition="'$(LLVMInstallDir)' !=
> ''">$(LLVMInstallDir)\</LLVMInstallDir>
>
>  <ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable>
>    </PropertyGroup>
>
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180806/9a9d50fb/attachment.html>