Handle LLVMInstallDir not being set for llvm tools integration

msvc-full-features/Cataclysm-common.props

@@ -13,8 +13,10 @@
     <_CDDA_BACKTRACE Condition="'$(BACKTRACE)'!=''">true</_CDDA_BACKTRACE>
     <_CDDA_RELEASE_BUILD>false</_CDDA_RELEASE_BUILD>
     <_CDDA_RELEASE_BUILD Condition="'$(CDDA_RELEASE_BUILD)'!=''">true</_CDDA_RELEASE_BUILD>
-    <CDDA_LLVM_LIB_PATH Condition="'$(CDDA_LLVM_LIB_PATH)'==''">$(LLVMInstallDir)</CDDA_LLVM_LIB_PATH>
-    <CDDA_LLD_LINK_PATH Condition="'$(CDDA_LLD_LINK_PATH)'==''">$(LLVMInstallDir)</CDDA_LLD_LINK_PATH>
+    <_CDDA_LLVM_BIN_PATH>$(VCInstallDir)Tools\Llvm\bin\</_CDDA_LLVM_BIN_PATH>
+    <_CDDA_LLVM_BIN_PATH Condition="'$(LLVMInstallDir)'!=''">$(LLVMInstallDir)bin\</_CDDA_LLVM_BIN_PATH>
+    <CDDA_LLVM_LIB_PATH Condition="'$(CDDA_LLVM_LIB_PATH)'==''">$(_CDDA_LLVM_BIN_PATH)</CDDA_LLVM_LIB_PATH>
+    <CDDA_LLD_LINK_PATH Condition="'$(CDDA_LLD_LINK_PATH)'==''">$(_CDDA_LLVM_BIN_PATH)</CDDA_LLD_LINK_PATH>
     <_CDDA_ENABLE_THIN_ARCHIVES>false</_CDDA_ENABLE_THIN_ARCHIVES>
     <_CDDA_ENABLE_THIN_ARCHIVES Condition="'$(CDDA_ENABLE_THIN_ARCHIVES)'!=''">true</_CDDA_ENABLE_THIN_ARCHIVES>
     <_CDDA_USE_LLD_LINK>false</_CDDA_USE_LLD_LINK>
@@ -27,11 +29,11 @@
     <ClToolPath>$(CDDA_CCACHE_PATH)</ClToolPath>
   </PropertyGroup>
   <PropertyGroup Condition="$(_CDDA_ENABLE_THIN_ARCHIVES)">
-    <LibToolPath>$(CDDA_LLVM_LIB_PATH)\bin</LibToolPath>
+    <LibToolPath>$(CDDA_LLVM_LIB_PATH)</LibToolPath>
     <LibToolExe>llvm-lib.exe</LibToolExe>
   </PropertyGroup>
   <PropertyGroup Condition="$(_CDDA_USE_LLD_LINK)">
-    <LinkToolPath>$(CDDA_LLD_LINK_PATH)\bin</LinkToolPath>
+    <LinkToolPath>$(CDDA_LLD_LINK_PATH)</LinkToolPath>
     <LinkToolExe>lld-link.exe</LinkToolExe>
     <!-- vcpkg passes dependecy libs via a glob pattern which lld-link doesn't accept. We have to manually enumerate the deps now. -->
     <VcpkgAutoLink>false</VcpkgAutoLink>