diff --git a/cmake/toolchain/windows-clang-cl.cmake b/cmake/toolchain/windows-clang-cl.cmake
index 373ac31..770c988 100644
--- a/cmake/toolchain/windows-clang-cl.cmake
+++ b/cmake/toolchain/windows-clang-cl.cmake
@@ -1 +1,7 @@
-set(CMAKE_GENERATOR_TOOLSET "clangcl")
\ No newline at end of file
+if (CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(CMAKE_GENERATOR_TOOLSET "clangcl")
+else()
+  set(CMAKE_C_COMPILER clang-cl.exe)
+  set(CMAKE_CXX_COMPILER clang-cl.exe)
+  set(CMAKE_LINKER lld-link.exe)
+endif()
\ No newline at end of file
diff --git a/cmake/toolchain/windows-msvc.cmake b/cmake/toolchain/windows-msvc.cmake
index d5fe2cb..34ad8c0 100644
--- a/cmake/toolchain/windows-msvc.cmake
+++ b/cmake/toolchain/windows-msvc.cmake
@@ -1 +1,3 @@
-set(CMAKE_GENERATOR_TOOLSET "v143")
\ No newline at end of file
+if (CMAKE_GENERATOR MATCHES "Visual Studio")
+  set(CMAKE_GENERATOR_TOOLSET "v143")
+endif()
\ No newline at end of file