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

[Hans Wennborg via Phabricator via llvm-commits]

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 --------------
A non-text attachment was scrubbed...
Name: D50335.159300.patch
Type: text/x-patch
Size: 1673 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180806/96090b04/attachment.bin>