@@ -89,6 +89,14 @@ option(LLAMA_LLGUIDANCE "llama-common: include LLGuidance library for structured
89
89
include (${CMAKE_CURRENT_SOURCE_DIR} /cmake/build-info.cmake )
90
90
include (${CMAKE_CURRENT_SOURCE_DIR} /cmake/common.cmake )
91
91
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
+
92
100
# override ggml options
93
101
set (GGML_ALL_WARNINGS ${LLAMA_ALL_WARNINGS} )
94
102
set (GGML_FATAL_WARNINGS ${LLAMA_FATAL_WARNINGS} )
@@ -155,6 +163,8 @@ if (LLAMA_USE_SYSTEM_GGML)
155
163
endif ()
156
164
157
165
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} )
158
168
add_subdirectory (ggml )
159
169
# ... otherwise assume ggml is added by a parent CMakeLists.txt
160
170
endif ()
@@ -204,10 +214,6 @@ endif()
204
214
include (GNUInstallDirs )
205
215
include (CMakePackageConfigHelpers )
206
216
207
- set (LLAMA_BUILD_NUMBER ${BUILD_NUMBER} )
208
- set (LLAMA_BUILD_COMMIT ${BUILD_COMMIT} )
209
- set (LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER} )
210
-
211
217
set (LLAMA_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files" )
212
218
set (LLAMA_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files" )
213
219
set (LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files" )
0 commit comments