Update Windows toolchains

Author: kasperisager

win32-arm64.cmake

@@ -1,29 +1,35 @@
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR ARM64)
 
+find_program(clang-cl clang-cl REQUIRED)
+find_program(lld-link lld-link REQUIRED)
+find_program(llvm-lib llvm-lib REQUIRED)
+find_program(llvm-nm llvm-nm REQUIRED)
+find_program(llvm-objdump llvm-objdump REQUIRED)
+find_program(llvm-ranlib llvm-ranlib REQUIRED)
+find_program(llvm-mt llvm-mt REQUIRED)
+find_program(llvm-strip llvm-strip REQUIRED)
+find_program(llvm-rc llvm-rc REQUIRED)
+
 set(target aarch64-windows-msvc)
 
-set(CMAKE_AR llvm-lib)
-set(CMAKE_LINKER lld-link)
-set(CMAKE_NM llvm-nm)
-set(CMAKE_OBJDUMP llvm-objdump)
-set(CMAKE_RANLIB llvm-ranlib)
-set(CMAKE_MT llvm-mt)
-set(CMAKE_STRIP llvm-strip)
+set(CMAKE_LINKER ${lld-link})
+set(CMAKE_AR ${llvm-lib})
+set(CMAKE_NM ${llvm-nm})
+set(CMAKE_OBJDUMP ${llvm-objdump})
+set(CMAKE_RANLIB ${llvm-ranlib})
+set(CMAKE_MT ${llvm-mt})
+set(CMAKE_STRIP ${llvm-strip})
 
-set(CMAKE_C_COMPILER clang-cl)
+set(CMAKE_C_COMPILER ${clang-cl})
 set(CMAKE_C_COMPILER_TARGET ${target})
-set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> /OUT:<TARGET> <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 
-set(CMAKE_CXX_COMPILER clang-cl)
+set(CMAKE_CXX_COMPILER ${clang-cl})
 set(CMAKE_CXX_COMPILER_TARGET ${target})
-set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> /OUT:<TARGET> <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 
-set(CMAKE_ASM_COMPILER clang-cl)
+set(CMAKE_ASM_COMPILER ${clang-cl})
 set(CMAKE_ASM_COMPILER_TARGET ${target})
 
-set(CMAKE_RC_COMPILER llvm-rc)
+set(CMAKE_RC_COMPILER ${llvm-rc})
 
 set(VCPKG_TARGET_TRIPLET arm64-windows)

win32-x64.cmake

@@ -1,29 +1,35 @@
 set(CMAKE_SYSTEM_NAME Windows)
 set(CMAKE_SYSTEM_PROCESSOR x64)
 
+find_program(clang-cl clang-cl REQUIRED)
+find_program(lld-link lld-link REQUIRED)
+find_program(llvm-lib llvm-lib REQUIRED)
+find_program(llvm-nm llvm-nm REQUIRED)
+find_program(llvm-objdump llvm-objdump REQUIRED)
+find_program(llvm-ranlib llvm-ranlib REQUIRED)
+find_program(llvm-mt llvm-mt REQUIRED)
+find_program(llvm-strip llvm-strip REQUIRED)
+find_program(llvm-rc llvm-rc REQUIRED)
+
 set(target x86_64-windows-msvc)
 
-set(CMAKE_AR llvm-lib)
-set(CMAKE_LINKER lld-link)
-set(CMAKE_NM llvm-nm)
-set(CMAKE_OBJDUMP llvm-objdump)
-set(CMAKE_RANLIB llvm-ranlib)
-set(CMAKE_MT llvm-mt)
-set(CMAKE_STRIP llvm-strip)
+set(CMAKE_LINKER ${lld-link})
+set(CMAKE_AR ${llvm-lib})
+set(CMAKE_NM ${llvm-nm})
+set(CMAKE_OBJDUMP ${llvm-objdump})
+set(CMAKE_RANLIB ${llvm-ranlib})
+set(CMAKE_MT ${llvm-mt})
+set(CMAKE_STRIP ${llvm-strip})
 
-set(CMAKE_C_COMPILER clang-cl)
+set(CMAKE_C_COMPILER ${clang-cl})
 set(CMAKE_C_COMPILER_TARGET ${target})
-set(CMAKE_C_ARCHIVE_CREATE "<CMAKE_AR> /OUT:<TARGET> <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_C_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 
-set(CMAKE_CXX_COMPILER clang-cl)
+set(CMAKE_CXX_COMPILER ${clang-cl})
 set(CMAKE_CXX_COMPILER_TARGET ${target})
-set(CMAKE_CXX_ARCHIVE_CREATE "<CMAKE_AR> /OUT:<TARGET> <LINK_FLAGS> <OBJECTS>")
-set(CMAKE_CXX_ARCHIVE_FINISH "<CMAKE_RANLIB> <TARGET>")
 
-set(CMAKE_ASM_COMPILER clang-cl)
+set(CMAKE_ASM_COMPILER ${clang-cl})
 set(CMAKE_ASM_COMPILER_TARGET ${target})
 
-set(CMAKE_RC_COMPILER llvm-rc)
+set(CMAKE_RC_COMPILER ${llvm-rc})
 
 set(VCPKG_TARGET_TRIPLET x64-windows)