Windows: re-organise toolchain cache (NFC)

Make a few more options more explicit and re-group a few options. This
is merely for ease of human processing.

Author: compnerd

cmake/caches/Windows-x86_64.cmake

@@ -15,17 +15,20 @@ set(LLVM_EXTERNAL_PROJECTS
 set(LLVM_ENABLE_ASSERTIONS YES CACHE BOOL "")
 
 set(ENABLE_X86_RELAX_RELOCATIONS YES CACHE BOOL "")
+
+set(LLVM_APPEND_VC_REV NO CACHE BOOL "")
 set(LLVM_ENABLE_PYTHON YES CACHE BOOL "")
 set(LLVM_TARGETS_TO_BUILD AArch64 ARM WebAssembly X86 CACHE STRING "")
 
 # Disable certain targets to reduce the configure time or to avoid configuration
 # differences (and in some cases weird build errors on a complete build).
-set(LLVM_APPEND_VC_REV NO CACHE BOOL "")
 set(LLVM_BUILD_LLVM_DYLIB NO CACHE BOOL "")
 set(LLVM_BUILD_LLVM_C_DYLIB NO CACHE BOOL "")
 set(LLVM_ENABLE_LIBEDIT NO CACHE BOOL "")
 set(LLVM_ENABLE_LIBXML2 NO CACHE BOOL "")
 set(LLVM_ENABLE_OCAMLDOC NO CACHE BOOL "")
+set(LLVM_ENABLE_TERMINFO NO CACHE BOOL "")
+set(LLVM_ENABLE_Z3_SOLVER NO CACHE BOOL "")
 set(LLVM_ENABLE_ZLIB NO CACHE BOOL "")
 set(LLVM_INCLUDE_BENCHMARKS NO CACHE BOOL "")
 set(LLVM_INCLUDE_DOCS NO CACHE BOOL "")