fix: Windows cmake build

Author: giladgd

llama/CMakeLists.txt

@@ -2,15 +2,12 @@ cmake_minimum_required(VERSION 3.14)
 
 if (NLC_TARGET_PLATFORM STREQUAL "win-arm64" AND (CMAKE_GENERATOR STREQUAL "Ninja" OR CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") AND NOT MINGW)
     if(NLC_CURRENT_PLATFORM STREQUAL "win-x64")
-        get_filename_component(INCLUDE_PROFILE_ABS "./profiles/llvm.win32.host-x64.target-arm64.cmake" ABSOLUTE)
-        include("${INCLUDE_PROFILE_ABS}")
+        include("./profiles/llvm.win32.host-x64.target-arm64.cmake")
     elseif(NLC_CURRENT_PLATFORM STREQUAL "win-arm64")
-        get_filename_component(INCLUDE_PROFILE_ABS "./profiles/llvm.win32.host-arm64.target-arm64.cmake" ABSOLUTE)
-        include("${INCLUDE_PROFILE_ABS}")
+        include("./profiles/llvm.win32.host-arm64.target-arm64.cmake")
     endif()
 elseif (NLC_CURRENT_PLATFORM STREQUAL "win-x64" AND NLC_TARGET_PLATFORM STREQUAL "win-x64" AND (CMAKE_GENERATOR STREQUAL "Ninja" OR CMAKE_GENERATOR STREQUAL "Ninja Multi-Config") AND NOT MINGW)
-    get_filename_component(INCLUDE_PROFILE_ABS "./profiles/llvm.win32.host-x64.target-x64.cmake" ABSOLUTE)
-    include("${INCLUDE_PROFILE_ABS}")
+    include("./profiles/llvm.win32.host-x64.target-x64.cmake")
 endif()
 
 project("llama-addon" C CXX)

llama/cmake/win32.ensureNinjaPath.cmake

@@ -19,8 +19,8 @@ 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)
+                    set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
+                    set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
                 endif()
             endif()
         endif()
@@ -34,8 +34,8 @@ 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)
+                    set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
+                    set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
                 endif()
             endif()
         endif()
@@ -44,12 +44,14 @@ function(ensureNinjaPath)
             foreach(PATH IN LISTS PROGRAMFILES_PATHS)
                 file(GLOB_RECURSE FOUND_NINJA_EXE
                     "${PATH}/Microsoft Visual Studio/*/CMake/Ninja/ninja.exe"
-                    "${PATH}/Microsoft Visual Studio/**/*/CMake/Ninja/ninja.exe")
+                    "${PATH}/Microsoft Visual Studio/**/*/CMake/Ninja/ninja.exe"
+                    "${PATH}/Microsoft Visual Studio/*/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe"
+                    "${PATH}/Microsoft Visual Studio/**/*/Common7/IDE/CommonExtensions/Microsoft/CMake/Ninja/ninja.exe")
 
                 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)
+                    set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}")
+                    set(CMAKE_MAKE_PROGRAM "${FOUND_CMAKE_MAKE_PROGRAM}" PARENT_SCOPE)
                     break()
                 endif()
             endforeach()