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.<br><div class="gmail_quote"><div dir="ltr">On Mon, Aug 6, 2018 at 10:37 AM Hans Wennborg via Phabricator <<a href="mailto:reviews@reviews.llvm.org">reviews@reviews.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">hans created this revision.<br>
hans added a reviewer: zturner.<br>
<br>
<a href="https://reviews.llvm.org/D50335" rel="noreferrer" target="_blank">https://reviews.llvm.org/D50335</a><br>
<br>
Files:<br>
tools/msbuild/LLVM.Cpp.Common.props<br>
tools/msbuild/llvm-general.xml<br>
<br>
<br>
Index: tools/msbuild/llvm-general.xml<br>
===================================================================<br>
--- tools/msbuild/llvm-general.xml<br>
+++ tools/msbuild/llvm-general.xml<br>
@@ -16,7 +16,7 @@<br>
DisplayName="Clang-CL Executable"<br>
Description="Specifies the path to clang-cl.exe."<br>
Category="General"<br>
- Default="$(LLVMInstallDir)bin\clang-cl.exe"<br>
+ Default="$(LLVMInstallDir)\bin\clang-cl.exe"<br>
Subtype="file"><br>
<StringProperty.DataSource><br>
<DataSource Persistence="ProjectFile" Label="" /><br>
Index: tools/msbuild/LLVM.Cpp.Common.props<br>
===================================================================<br>
--- tools/msbuild/LLVM.Cpp.Common.props<br>
+++ tools/msbuild/LLVM.Cpp.Common.props<br>
@@ -37,9 +37,9 @@<br>
<br>
<!-- Find an installed LLVM and set up our paths. --><br>
<PropertyGroup><br>
- <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM@LLVM)</LLVMInstallDir><br>
- <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM@LLVM)</LLVMInstallDir><br>
- <ClangClExecutable>$(LLVMInstallDir)bin\clang-cl.exe</ClangClExecutable><br>
+ <LLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</LLVMInstallDir><br>
+ <LLVMInstallDir Condition="'$(LLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</LLVMInstallDir><br>
+ <ClangClExecutable>$(LLVMInstallDir)\bin\clang-cl.exe</ClangClExecutable><br>
</PropertyGroup><br>
<br>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props" Condition="Exists('$(VCTargetsPath)\Microsoft.Cpp.WindowsSDK.props')"/><br>
<br>
<br>
</blockquote></div>