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

[Zachary Turner via llvm-commits]

I’m pretty sure I tested this code path, was it wrong? Also I don’t think
we should be explicitly adding the \ after the $(LLVMInstallDir), if you
look through the way every other path in a VS project works, they assume
the \ is in the registry path, so if it’s possible I think we should follow
the same pattern.
On Mon, Aug 6, 2018 at 10:37 AM Hans Wennborg via Phabricator <
reviews at reviews.llvm.org> wrote:

> hans created this revision.
> hans added a reviewer: zturner.
>
> https://reviews.llvm.org/D50335
>
> Files:
>   tools/msbuild/LLVM.Cpp.Common.props
>   tools/msbuild/llvm-general.xml
>
>
> Index: tools/msbuild/llvm-general.xml
> ===================================================================
> --- tools/msbuild/llvm-general.xml
> +++ tools/msbuild/llvm-general.xml
> @@ -16,7 +16,7 @@
>                    DisplayName="Clang-CL Executable"
>                    Description="Specifies the path to clang-cl.exe."
>                    Category="General"
> -                  Default="$(LLVMInstallDir)bin\clang-cl.exe"
> +                  Default="$(LLVMInstallDir)\bin\clang-cl.exe"
>                    Subtype="file">
>      <StringProperty.DataSource>
>        <DataSource Persistence="ProjectFile" Label="" />
> Index: tools/msbuild/LLVM.Cpp.Common.props
> ===================================================================
> --- tools/msbuild/LLVM.Cpp.Common.props
> +++ tools/msbuild/LLVM.Cpp.Common.props
> @@ -37,9 +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>
> -
> <ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable>
> +
> <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir>
> +    <LLVMInstallDir Condition="'$(LLVMInstallDir)' ==
> ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir>
> +
> <ClangClExecutable>$(LLVMInstallDir)\bin\clang-cl.exe</ClangClExecutable>
>    </PropertyGroup>
>
>    <Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props"
> Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/>
>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180806/2e9287ef/attachment.html>