Only use official LLVM install directory when bin\clang-cl.exe exists, trying to fix issue #7.

Author: zufuliu

VS2017/LLVM/LLVM.Common.props

@@ -1,12 +1,12 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <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>
-    <LldLinkExecutable>$(LLVMInstallDir)bin\lld-link.exe</LldLinkExecutable>
-    <LlvmLibExecutable>$(LLVMInstallDir)bin\llvm-lib.exe</LlvmLibExecutable>
-    <LlvmRcExecutable>$(LLVMInstallDir)bin\llvm-rc.exe</LlvmRcExecutable>
+    <OfficialLLVMInstallDir>$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\LLVM\LLVM)</OfficialLLVMInstallDir>
+    <OfficialLLVMInstallDir Condition="'$(OfficialLLVMInstallDir)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\LLVM\LLVM)</OfficialLLVMInstallDir>
+    <LLVMInstallDir Condition="Exists('$(OfficialLLVMInstallDir)\bin\clang-cl.exe')">$(OfficialLLVMInstallDir)</LLVMInstallDir>
+    <ClangClExecutable>$(LLVMInstallDir)\bin\clang-cl.exe</ClangClExecutable>
+    <LldLinkExecutable>$(LLVMInstallDir)\bin\lld-link.exe</LldLinkExecutable>
+    <LlvmLibExecutable>$(LLVMInstallDir)\bin\llvm-lib.exe</LlvmLibExecutable>
+    <LlvmRcExecutable>$(LLVMInstallDir)\bin\llvm-rc.exe</LlvmRcExecutable>
     <UseClangCl>true</UseClangCl>
     <UseLldLink>false</UseLldLink>
     <UseLlvmLib>false</UseLlvmLib>

VS2017/LLVM/llvm-general.xml

@@ -22,7 +22,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>
 
@@ -42,7 +42,7 @@
                   DisplayName="lld-link Executable"
                   Description="Specifies the path to lld-link.exe."
                   Category="General"
-                  Default="$(LLVMInstallDir)bin\lld-link.exe"
+                  Default="$(LLVMInstallDir)\bin\lld-link.exe"
                   Subtype="file">
   </StringProperty>
 
@@ -62,7 +62,7 @@
                   DisplayName="llvm-lib Executable"
                   Description="Specifies the path to llvm-lib.exe."
                   Category="General"
-                  Default="$(LLVMInstallDir)bin\llvm-lib.exe"
+                  Default="$(LLVMInstallDir)\bin\llvm-lib.exe"
                   Subtype="file">
   </StringProperty>
 
@@ -82,7 +82,7 @@
                   DisplayName="llvm-rc Executable"
                   Description="Specifies the path to llvm-rc.exe."
                   Category="General"
-                  Default="$(LLVMInstallDir)bin\llvm-rc.exe"
+                  Default="$(LLVMInstallDir)\bin\llvm-rc.exe"
                   Subtype="file">
   </StringProperty>