|
@@ -89,6 +89,14 @@ option(LLAMA_LLGUIDANCE "llama-common: include LLGuidance library for structured
|
|
|
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
|
|
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/build-info.cmake)
|
|
|
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/common.cmake)
|
|
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/common.cmake)
|
|
|
|
|
|
|
|
|
|
+if (NOT DEFINED LLAMA_BUILD_NUMBER)
|
|
|
|
|
+ set(LLAMA_BUILD_NUMBER ${BUILD_NUMBER})
|
|
|
|
|
+endif()
|
|
|
|
|
+if (NOT DEFINED LLAMA_BUILD_COMMIT)
|
|
|
|
|
+ set(LLAMA_BUILD_COMMIT ${BUILD_COMMIT})
|
|
|
|
|
+endif()
|
|
|
|
|
+set(LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER})
|
|
|
|
|
+
|
|
|
# override ggml options
|
|
# override ggml options
|
|
|
set(GGML_ALL_WARNINGS ${LLAMA_ALL_WARNINGS})
|
|
set(GGML_ALL_WARNINGS ${LLAMA_ALL_WARNINGS})
|
|
|
set(GGML_FATAL_WARNINGS ${LLAMA_FATAL_WARNINGS})
|
|
set(GGML_FATAL_WARNINGS ${LLAMA_FATAL_WARNINGS})
|
|
@@ -155,6 +163,8 @@ if (LLAMA_USE_SYSTEM_GGML)
|
|
|
endif()
|
|
endif()
|
|
|
|
|
|
|
|
if (NOT TARGET ggml AND NOT LLAMA_USE_SYSTEM_GGML)
|
|
if (NOT TARGET ggml AND NOT LLAMA_USE_SYSTEM_GGML)
|
|
|
|
|
+ set(GGML_BUILD_NUMBER ${LLAMA_BUILD_NUMBER})
|
|
|
|
|
+ set(GGML_BUILD_COMMIT ${LLAMA_BUILD_COMMIT})
|
|
|
add_subdirectory(ggml)
|
|
add_subdirectory(ggml)
|
|
|
# ... otherwise assume ggml is added by a parent CMakeLists.txt
|
|
# ... otherwise assume ggml is added by a parent CMakeLists.txt
|
|
|
endif()
|
|
endif()
|
|
@@ -204,10 +214,6 @@ endif()
|
|
|
include(GNUInstallDirs)
|
|
include(GNUInstallDirs)
|
|
|
include(CMakePackageConfigHelpers)
|
|
include(CMakePackageConfigHelpers)
|
|
|
|
|
|
|
|
-set(LLAMA_BUILD_NUMBER ${BUILD_NUMBER})
|
|
|
|
|
-set(LLAMA_BUILD_COMMIT ${BUILD_COMMIT})
|
|
|
|
|
-set(LLAMA_INSTALL_VERSION 0.0.${BUILD_NUMBER})
|
|
|
|
|
-
|
|
|
|
|
set(LLAMA_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
|
|
set(LLAMA_INCLUDE_INSTALL_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE PATH "Location of header files")
|
|
|
set(LLAMA_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
|
|
set(LLAMA_LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR} CACHE PATH "Location of library files")
|
|
|
set(LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
|
|
set(LLAMA_BIN_INSTALL_DIR ${CMAKE_INSTALL_BINDIR} CACHE PATH "Location of binary files")
|