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

[Hans Wennborg via Phabricator via llvm-commits]

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