vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use proper build info

Browse source
This commit is contained in:
Mason M 2023-08-31 09:30:24 -03:00
parent 93212d5371
commit b0c6fa5656
2 changed files with 7 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CMakeLists.txt
View file

@ -606,7 +606,9 @@ set(LLAMA_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}
CACHE PATH "Location of library files") CACHE PATH "Location of library files")
set(LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} set(LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR}
CACHE PATH "Location of binary files") CACHE PATH "Location of binary files")
set(LLAMA_INSTALL_VERSION 0.0.1) #TODO: Use patch from build-info number set(LLAMA_BUILD_NUMBER ${BUILD_NUMBER})
set(LLAMA_BUILD_COMMIT ${BUILD_COMMIT})
set(LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER})
configure_package_config_file( configure_package_config_file(
${CMAKE_CURRENT_SOURCE_DIR}/scripts/LlamaConfig.cmake.in ${CMAKE_CURRENT_SOURCE_DIR}/scripts/LlamaConfig.cmake.in
@ -615,6 +617,8 @@ configure_package_config_file(
PATH_VARS LLAMA_INCLUDE_INSTALL_DIR PATH_VARS LLAMA_INCLUDE_INSTALL_DIR
LLAMA_LIB_INSTALL_DIR LLAMA_LIB_INSTALL_DIR
LLAMA_BIN_INSTALL_DIR LLAMA_BIN_INSTALL_DIR
LLAMA_BUILD_NUMBER
LLAMA_BUILD_COMMIT
LLAMA_INSTALL_VERSION) LLAMA_INSTALL_VERSION)
write_basic_package_version_file( write_basic_package_version_file(

2
scripts/LlamaConfig.cmake.in
View file

@ -1,4 +1,6 @@
set(LLAMA_VERSION @LLAMA_INSTALL_VERSION@) set(LLAMA_VERSION @LLAMA_INSTALL_VERSION@)
set(LLAMA_BUILD_COMMIT @LLAMA_BUILD_COMMIT@)
set(LLAMA_BUILD_NUMBER @LLAMA_BUILD_NUMBER@)
@PACKAGE_INIT@ @PACKAGE_INIT@