fix: Windows cmake build

Author: giladgd

llama/cmake/win32.ensureNinjaPath.cmake

@@ -2,9 +2,11 @@ function(ensureNinjaPath)
     if ((NOT DEFINED CMAKE_MAKE_PROGRAM OR NOT EXISTS "${CMAKE_MAKE_PROGRAM}" OR NOT CMAKE_MAKE_PROGRAM) AND (CMAKE_GENERATOR STREQUAL "Ninja" OR CMAKE_GENERATOR STREQUAL "Ninja Multi-Config"))
         find_program(NINJA_EXECUTABLE ninja)
 
+        set(CMAKE_MAKE_PROGRAM "")
         set(CMAKE_MAKE_PROGRAM "" PARENT_SCOPE)
 
         if(NINJA_EXECUTABLE AND EXISTS "${NINJA_EXECUTABLE}")
+            set(CMAKE_MAKE_PROGRAM "${NINJA_EXECUTABLE}")
             set(CMAKE_MAKE_PROGRAM "${NINJA_EXECUTABLE}" PARENT_SCOPE)
         endif()
 
@@ -17,6 +19,7 @@ function(ensureNinjaPath)
 
                 if(FOUND_NINJA_EXE)
                     list(GET FOUND_NINJA_EXE 0 FOUND_CMAKE_MAKE_PROGRAM)
+                    list(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
                     list(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
                 endif()
             endif()
@@ -31,6 +34,7 @@ function(ensureNinjaPath)
 
                 if(FOUND_NINJA_EXE)
                     list(GET FOUND_NINJA_EXE 0 FOUND_CMAKE_MAKE_PROGRAM)
+                    list(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
                     list(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
                 endif()
             endif()
@@ -44,6 +48,7 @@ function(ensureNinjaPath)
 
                 if(FOUND_NINJA_EXE)
                     list(GET FOUND_NINJA_EXE 0 FOUND_CMAKE_MAKE_PROGRAM)
+                    list(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
                     list(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
                     break()
                 endif()

llama/cmake/win32.llvmUseGnuModeCompilers.cmake

@@ -1,8 +1,11 @@
 function(llvmUseGnuModeCompilers CURRENT_ARCH)
     set(LLVM_INSTALLATION_URL "https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.5")
 
+    set(CMAKE_C_COMPILER clang)
     set(CMAKE_C_COMPILER clang PARENT_SCOPE)
+    set(CMAKE_CXX_COMPILER clang++)
     set(CMAKE_CXX_COMPILER clang++ PARENT_SCOPE)
+    set(CMAKE_RC_COMPILER llvm-rc)
     set(CMAKE_RC_COMPILER llvm-rc PARENT_SCOPE)
 
 
@@ -33,9 +36,11 @@ function(llvmUseGnuModeCompilers CURRENT_ARCH)
 
     list(REMOVE_DUPLICATES LLVM_INSTALL_PATHS)
 
+    set(LLVM_ROOT "")
     set(LLVM_ROOT "" PARENT_SCOPE)
     foreach(PATH IN LISTS LLVM_INSTALL_PATHS)
         if(EXISTS "${PATH}/bin/clang.exe" AND EXISTS "${PATH}/bin/clang++.exe" AND EXISTS "${PATH}/bin/llvm-rc.exe")
+            set(LLVM_ROOT "${PATH}")
             set(LLVM_ROOT "${PATH}" PARENT_SCOPE)
             break()
         endif()
@@ -50,8 +55,11 @@ function(llvmUseGnuModeCompilers CURRENT_ARCH)
     endif()
 
     if (NOT EXISTS "${CMAKE_C_COMPILER}" OR NOT EXISTS "${CMAKE_CXX_COMPILER}" OR NOT EXISTS "${CMAKE_RC_COMPILER}")
+        set(CMAKE_C_COMPILER "${LLVM_ROOT}/bin/clang.exe")
         set(CMAKE_C_COMPILER "${LLVM_ROOT}/bin/clang.exe" PARENT_SCOPE)
+        set(CMAKE_CXX_COMPILER "${LLVM_ROOT}/bin/clang++.exe")
         set(CMAKE_CXX_COMPILER "${LLVM_ROOT}/bin/clang++.exe" PARENT_SCOPE)
+        set(CMAKE_RC_COMPILER "${LLVM_ROOT}/bin/llvm-rc.exe")
         set(CMAKE_RC_COMPILER "${LLVM_ROOT}/bin/llvm-rc.exe" PARENT_SCOPE)
     endif()