[llvm] r339117 - vs integration: fix default path to clang-cl

[Hans Wennborg via llvm-commits]

Author: hans
Date: Tue Aug  7 02:02:06 2018
New Revision: 339117

URL: http://llvm.org/viewvc/llvm-project?rev=339117&view=rev
Log:
vs integration: fix default path to clang-cl

Differential Revision: https://reviews.llvm.org/D50335

Modified:
    llvm/trunk/tools/msbuild/LLVM.Cpp.Common.props

Modified: llvm/trunk/tools/msbuild/LLVM.Cpp.Common.props
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/msbuild/LLVM.Cpp.Common.props?rev=339117&r1=339116&r2=339117&view=diff
==============================================================================
--- llvm/trunk/tools/msbuild/LLVM.Cpp.Common.props (original)
+++ llvm/trunk/tools/msbuild/LLVM.Cpp.Common.props Tue Aug  7 02:02:06 2018
@@ -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>