Skip to content

Commit 9d859eb

Browse files
giladgdgiladgd
committed
fix: Windows cmake build
1 parent 8ba5938 commit 9d859eb

11 files changed

+44
-44
lines changed

‎llama/cmake/win32.ensureNinjaPath.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function(ensureNinjaPath PROGRAMFILES_PATHS)
1+
function(ensureNinjaPath)
22
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"))
33
find_program(NINJA_EXECUTABLE ninja)
44

‎llama/cmake/win32.ensureNodeLib.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function(ensureNodeLib PROGRAMFILES_PATHS HOST_ARCH TARGET_ARCH)
1+
function(ensureNodeLib HOST_ARCH TARGET_ARCH)
22
if (CMAKE_JS_NODELIB_DEF AND CMAKE_JS_NODELIB_TARGET)
33
if (NOT DEFINED NODE_LIB_CMAKE_AR)
44
foreach(PATH IN LISTS PROGRAMFILES_PATHS)

‎llama/cmake/win32.llvmEnsureCmakeAr.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function(llvmEnsureCmakeAr PROGRAMFILES_PATHS CURRENT_ARCH)
1+
function(llvmEnsureCmakeAr CURRENT_ARCH)
22
set (LLVM_DIR_ARCH_NAME "")
33
if (CURRENT_ARCH STREQUAL "x64")
44
set (LLVM_DIR_ARCH_NAME "x64")

‎llama/cmake/win32.llvmUseGnuModeCompilers.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function(llvmUseGnuModeCompilers CURRENT_ARCH PROGRAMFILES_PATHS)
1+
function(llvmUseGnuModeCompilers CURRENT_ARCH)
22
set(LLVM_INSTALLATION_URL "https://github.com/llvm/llvm-project/releases/tag/llvmorg-19.1.5")
33

44
set(CMAKE_C_COMPILER clang)

‎llama/cmake/win32.programFilesPaths.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
function(setProgramFilesPaths CURRENT_ARCH PROGRAMFILES_PATHS)
1+
function(setProgramFilesPaths CURRENT_ARCH)
22
set(PROGRAMFILES "$ENV{ProgramFiles}")
33
set(PROGRAMFILES_X86 "$ENV{ProgramFiles\(x86\)}")
44
file(TO_CMAKE_PATH "${PROGRAMFILES}" PROGRAMFILES)

‎llama/profiles/llvm.win32.host-arm64.target-arm64.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
include(../cmake/win32.programFilesPaths.cmake)
2-
setProgramFilesPaths("arm64" PROGRAMFILES_PATHS)
1+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.programFilesPaths.cmake")
2+
setProgramFilesPaths("arm64")
33

4-
include(../cmake/win32.ensureNodeLib.cmake)
5-
ensureNodeLib(PROGRAMFILES_PATHS "arm64" "arm64")
4+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.ensureNodeLib.cmake")
5+
ensureNodeLib("arm64" "arm64")
66

7-
include(../cmake/win32.llvmApplyGnuModeAdaptations.cmake)
7+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmApplyGnuModeAdaptations.cmake")
88
llvmApplyGnuModeAdaptations()
99

10-
include(../cmake/win32.llvmEnsureCmakeAr.cmake)
11-
llvmEnsureCmakeAr(PROGRAMFILES_PATHS "arm64")
10+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmEnsureCmakeAr.cmake")
11+
llvmEnsureCmakeAr("arm64")

‎llama/profiles/llvm.win32.host-x64.target-arm64.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
include(../cmake/win32.programFilesPaths.cmake)
2-
setProgramFilesPaths("x64" PROGRAMFILES_PATHS)
1+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.programFilesPaths.cmake")
2+
setProgramFilesPaths("x64")
33

4-
include(../cmake/win32.ensureNodeLib.cmake)
5-
ensureNodeLib(PROGRAMFILES_PATHS "x64" "arm64")
4+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.ensureNodeLib.cmake")
5+
ensureNodeLib("x64" "arm64")
66

7-
include(../cmake/win32.llvmApplyGnuModeAdaptations.cmake)
7+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmApplyGnuModeAdaptations.cmake")
88
llvmApplyGnuModeAdaptations()
99

10-
include(../cmake/win32.llvmEnsureCmakeAr.cmake)
11-
llvmEnsureCmakeAr(PROGRAMFILES_PATHS "x64")
10+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmEnsureCmakeAr.cmake")
11+
llvmEnsureCmakeAr("x64")

‎llama/profiles/llvm.win32.host-x64.target-x64.cmake‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
include(../cmake/win32.programFilesPaths.cmake)
2-
setProgramFilesPaths("x64" PROGRAMFILES_PATHS)
1+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.programFilesPaths.cmake")
2+
setProgramFilesPaths("x64")
33

4-
include(../cmake/win32.ensureNodeLib.cmake)
5-
ensureNodeLib(PROGRAMFILES_PATHS "x64" "x64")
4+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.ensureNodeLib.cmake")
5+
ensureNodeLib("x64" "x64")
66

7-
include(../cmake/win32.llvmApplyGnuModeAdaptations.cmake)
7+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmApplyGnuModeAdaptations.cmake")
88
llvmApplyGnuModeAdaptations()
99

10-
include(../cmake/win32.llvmEnsureCmakeAr.cmake)
11-
llvmEnsureCmakeAr(PROGRAMFILES_PATHS "x64")
10+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmEnsureCmakeAr.cmake")
11+
llvmEnsureCmakeAr("x64")

‎llama/toolchains/llvm.win32.host-x64.target-x64.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ set(target x86_64-pc-windows-msvc)
55
set(CMAKE_C_COMPILER_TARGET ${target})
66
set(CMAKE_CXX_COMPILER_TARGET ${target})
77

8-
include(../cmake/win32.programFilesPaths.cmake)
9-
setProgramFilesPaths("x64" PROGRAMFILES_PATHS)
8+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.programFilesPaths.cmake")
9+
setProgramFilesPaths("x64")
1010

11-
include(../cmake/win32.llvmUseGnuModeCompilers.cmake)
12-
llvmUseGnuModeCompilers("x64" PROGRAMFILES_PATHS)
11+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmUseGnuModeCompilers.cmake")
12+
llvmUseGnuModeCompilers("x64")
1313

14-
include(../cmake/win32.ensureNinjaPath.cmake)
15-
ensureNinjaPath(PROGRAMFILES_PATHS)
14+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.ensureNinjaPath.cmake")
15+
ensureNinjaPath()
1616

1717
set(arch_c_flags "-march=native")
1818

‎llama/toolchains/win32.host-arm64.target-arm64.cmake‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ set(target arm64-pc-windows-msvc)
55
set(CMAKE_C_COMPILER_TARGET ${target})
66
set(CMAKE_CXX_COMPILER_TARGET ${target})
77

8-
include(../cmake/win32.programFilesPaths.cmake)
9-
setProgramFilesPaths("arm64" PROGRAMFILES_PATHS)
8+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.programFilesPaths.cmake")
9+
setProgramFilesPaths("arm64")
1010

11-
include(../cmake/win32.llvmUseGnuModeCompilers.cmake)
12-
llvmUseGnuModeCompilers("arm64" PROGRAMFILES_PATHS)
11+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.llvmUseGnuModeCompilers.cmake")
12+
llvmUseGnuModeCompilers("arm64")
1313

14-
include(../cmake/win32.ensureNinjaPath.cmake)
15-
ensureNinjaPath(PROGRAMFILES_PATHS)
14+
include("${CMAKE_CURRENT_LIST_DIR}/../cmake/win32.ensureNinjaPath.cmake")
15+
ensureNinjaPath()
1616

1717
set(arch_c_flags "-march=armv8.7-a -fvectorize -ffp-model=fast -fno-finite-math-only")
1818
set(warn_c_flags "-Wno-format -Wno-unused-variable -Wno-unused-function -Wno-gnu-zero-variadic-macro-arguments")

0 commit comments

Comments
 (0)