root/llama.cpp
1
0
Fork 0
mirror of https://github.com/ggerganov/llama.cpp.git synced 2024-12-24 10:24:35 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

main-cmake-pkg : fix build issue (#4665)

Browse Source 
* Fix main-cmake-pkg compilation

* Use glob to load common files

* cmake : fix trailing whitespace

---------

Co-authored-by: Georgi Gerganov <ggerganov@gmail.com>
This commit is contained in:
andrijdavid 2023-12-29 15:18:20 +01:00 committed by GitHub
parent afd997ab60
commit 82d6eab224
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
examples/main-cmake-pkg/CMakeLists.txt
View File

@ -7,28 +7,13 @@ find_package(Llama 0.0.1 REQUIRED)
# Bake common functionality in with target. Because applications # Bake common functionality in with target. Because applications
# using the relocatable Llama package should be outside of the # using the relocatable Llama package should be outside of the
# source tree, main-cmake-pkg pretends the dependencies are built-in. # source tree, main-cmake-pkg pretends the dependencies are built-in.
set(_common_path "${CMAKE_CURRENT_LIST_DIR}/../../common") set(_common_path "${CMAKE_CURRENT_LIST_DIR}/../../common")
add_library(common OBJECT add_library(common OBJECT)
${_common_path}/common.h file(GLOB _common_files
${_common_path}/common.cpp "${_common_path}/*.h"
${_common_path}/console.h "${_common_path}/*.cpp"
${_common_path}/console.cpp )
${_common_path}/grammar-parser.h target_sources(common PRIVATE ${_common_files})
${_common_path}/grammar-parser.cpp
${_common_path}/sampling.h
${_common_path}/sampling.cpp
)
# WARNING: because build-info.h is auto-generated, it will only
# be available after the user has built the llama.cpp sources.
#
configure_file(${_common_path}/../build-info.h
${CMAKE_CURRENT_BINARY_DIR}/build-info.h
COPYONLY)
target_include_directories(common PUBLIC ${LLAMA_INCLUDE_DIR}
${CMAKE_CURRENT_BINARY_DIR})
# If the common project was part of "main-cmake-pkg" the transient # If the common project was part of "main-cmake-pkg" the transient
# defines would automatically be attached. Because the common func- # defines would automatically be attached. Because the common func-