fix: Windows build

Author: giladgd

llama/CMakeLists.txt

@@ -27,11 +27,6 @@ endif()
 add_definitions(-DNAPI_VERSION=7)
 set(CMAKE_POSITION_INDEPENDENT_CODE ON)
 
-execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"
-                WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-                OUTPUT_VARIABLE NODE_ADDON_API_DIR
-                OUTPUT_STRIP_TRAILING_WHITESPACE)
-
 set(LLAMA_BUILD_COMMON ON)
 
 if (MINGW)
@@ -53,53 +48,61 @@ else()
     set(CMAKE_BUILD_RPATH_USE_ORIGIN ON)
 endif()
 
-include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC})
+if (NOT DEFINED NLC_SINGLE_LLAMA_CPP_TARGET)
+    execute_process(COMMAND node -p "require('node-addon-api').include.slice(1,-1)"
+        WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+        OUTPUT_VARIABLE NODE_ADDON_API_DIR
+        OUTPUT_STRIP_TRAILING_WHITESPACE)
+    include_directories(${NODE_ADDON_API_DIR} ${CMAKE_JS_INC})
+endif()
 
 add_subdirectory("llama.cpp")
 include_directories("llama.cpp")
 include_directories("./llama.cpp/common")
 
-unset(GPU_INFO_HEADERS)
-unset(GPU_INFO_SOURCES)
-unset(GPU_INFO_EXTRA_LIBS)
-
-if (GGML_VULKAN OR GGML_KOMPUTE)
-    find_package(Vulkan)
-    if (Vulkan_FOUND)
-        if (GGML_VULKAN)
-            message(STATUS "Using Vulkan for GPU info")
-        elseif (GGML_KOMPUTE)
-            message(STATUS "Using Vulkan for GPU info because Kompute is enabled")
-        endif()
+if (NOT DEFINED NLC_SINGLE_LLAMA_CPP_TARGET)
+    unset(GPU_INFO_HEADERS)
+    unset(GPU_INFO_SOURCES)
+    unset(GPU_INFO_EXTRA_LIBS)
 
-        list(APPEND GPU_INFO_HEADERS gpuInfo/vulkan-gpu-info.h)
-        list(APPEND GPU_INFO_SOURCES gpuInfo/vulkan-gpu-info.cpp)
+    if (GGML_VULKAN OR GGML_KOMPUTE)
+        find_package(Vulkan)
+        if (Vulkan_FOUND)
+            if (GGML_VULKAN)
+                message(STATUS "Using Vulkan for GPU info")
+            elseif (GGML_KOMPUTE)
+                message(STATUS "Using Vulkan for GPU info because Kompute is enabled")
+            endif()
 
-        add_compile_definitions(GPU_INFO_USE_VULKAN)
+            list(APPEND GPU_INFO_HEADERS gpuInfo/vulkan-gpu-info.h)
+            list(APPEND GPU_INFO_SOURCES gpuInfo/vulkan-gpu-info.cpp)
 
-        list(APPEND GPU_INFO_EXTRA_LIBS Vulkan::Vulkan)
-    else()
-        message(FATAL_ERROR "Vulkan was not found")
+            add_compile_definitions(GPU_INFO_USE_VULKAN)
+
+            list(APPEND GPU_INFO_EXTRA_LIBS Vulkan::Vulkan)
+        else()
+            message(FATAL_ERROR "Vulkan was not found")
+        endif()
     endif()
-endif()
 
-list(REMOVE_DUPLICATES GPU_INFO_HEADERS)
-list(REMOVE_DUPLICATES GPU_INFO_SOURCES)
-list(REMOVE_DUPLICATES GPU_INFO_EXTRA_LIBS)
+    list(REMOVE_DUPLICATES GPU_INFO_HEADERS)
+    list(REMOVE_DUPLICATES GPU_INFO_SOURCES)
+    list(REMOVE_DUPLICATES GPU_INFO_EXTRA_LIBS)
 
-file(GLOB SOURCE_FILES "addon/*.cpp" "addon/**/*.cpp" ${GPU_INFO_SOURCES})
+    file(GLOB SOURCE_FILES "addon/*.cpp" "addon/**/*.cpp" ${GPU_INFO_SOURCES})
 
-add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC} ${GPU_INFO_HEADERS})
-set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
-target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
-target_link_libraries(${PROJECT_NAME} "llama")
-target_link_libraries(${PROJECT_NAME} "common")
+    add_library(${PROJECT_NAME} SHARED ${SOURCE_FILES} ${CMAKE_JS_SRC} ${GPU_INFO_HEADERS})
+    set_target_properties(${PROJECT_NAME} PROPERTIES PREFIX "" SUFFIX ".node")
+    target_link_libraries(${PROJECT_NAME} ${CMAKE_JS_LIB})
+    target_link_libraries(${PROJECT_NAME} "llama")
+    target_link_libraries(${PROJECT_NAME} "common")
 
-if (DEFINED GPU_INFO_EXTRA_LIBS)
-    target_link_libraries(${PROJECT_NAME} ${GPU_INFO_EXTRA_LIBS})
-endif()
+    if (DEFINED GPU_INFO_EXTRA_LIBS)
+        target_link_libraries(${PROJECT_NAME} ${GPU_INFO_EXTRA_LIBS})
+    endif()
 
-if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
-  # Generate node.lib
-  execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
+    if(MSVC AND CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
+    # Generate node.lib
+    execute_process(COMMAND ${CMAKE_AR} /def:${CMAKE_JS_NODELIB_DEF} /out:${CMAKE_JS_NODELIB_TARGET} ${CMAKE_STATIC_LINKER_FLAGS})
+    endif()
 endif()

src/bindings/utils/compileLLamaCpp.ts

@@ -216,7 +216,8 @@ export async function compileLlamaCpp(buildOptions: BuildOptions, compileOptions
                                 ...(
                                     [
                                         ...cmakeCustomOptions,
-                                        [targetFlag, targetValue]
+                                        [targetFlag, targetValue],
+                                        ["NLC_SINGLE_LLAMA_CPP_TARGET", "1"]
                                     ].map(([key, value]) => "--CD" + key + "=" + value)
                                 )
                             ],