Skip to content

Commit cc8d081

Browse files
authored
cmake: Add ability to pass in LLAMA_BUILD_NUMBER/COMMIT (#14167)
* cmake: Add ability to pass in LLAMA_BUILD_NUMBER/COMMIT * cmake: Pass on LLAMA_BUILD_* to GGML_BUILD_*
1 parent d714dad commit cc8d081

File tree

2 files changed

+12
-6
lines changed

2 files changed

+12
-6
lines changed

CMakeLists.txt

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,14 @@ option(LLAMA_LLGUIDANCE "llama-common: include LLGuidance library for structured
8989
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
9090
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/common.cmake)
9191

92+
if (NOT DEFINED LLAMA_BUILD_NUMBER)
93+
set(LLAMA_BUILD_NUMBER ${BUILD_NUMBER})
94+
endif()
95+
if (NOT DEFINED LLAMA_BUILD_COMMIT)
96+
set(LLAMA_BUILD_COMMIT ${BUILD_COMMIT})
97+
endif()
98+
set(LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER})
99+
92100
# override ggml options
93101
set(GGML_ALL_WARNINGS ${LLAMA_ALL_WARNINGS})
94102
set(GGML_FATAL_WARNINGS ${LLAMA_FATAL_WARNINGS})
@@ -155,6 +163,8 @@ if (LLAMA_USE_SYSTEM_GGML)
155163
endif()
156164

157165
if (NOT TARGET ggml AND NOT LLAMA_USE_SYSTEM_GGML)
166+
set(GGML_BUILD_NUMBER ${LLAMA_BUILD_NUMBER})
167+
set(GGML_BUILD_COMMIT ${LLAMA_BUILD_COMMIT})
158168
add_subdirectory(ggml)
159169
# ... otherwise assume ggml is added by a parent CMakeLists.txt
160170
endif()
@@ -204,10 +214,6 @@ endif()
204214
include(GNUInstallDirs)
205215
include(CMakePackageConfigHelpers)
206216

207-
set(LLAMA_BUILD_NUMBER ${BUILD_NUMBER})
208-
set(LLAMA_BUILD_COMMIT ${BUILD_COMMIT})
209-
set(LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER})
210-
211217
set(LLAMA_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
212218
set(LLAMA_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
213219
set(LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")

common/build-info.cpp.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
int LLAMA_BUILD_NUMBER = @BUILD_NUMBER@;
2-
char const *LLAMA_COMMIT = "@BUILD_COMMIT@";
1+
int LLAMA_BUILD_NUMBER = @LLAMA_BUILD_NUMBER@;
2+
char const *LLAMA_COMMIT = "@LLAMA_BUILD_COMMIT@";
33
char const *LLAMA_COMPILER = "@BUILD_COMPILER@";
44
char const *LLAMA_BUILD_TARGET = "@BUILD_TARGET@";

0 commit comments

Comments
 (0)