diff options
| author | cebtenzzre <cebtenzzre@gmail.com> | 2023-11-02 02:50:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-11-02 08:50:16 +0200 |
| commit | b12fa0d1c13596869c512f49a526b979c94787cc (patch) | |
| tree | 663ddc7bd68e32f219127839e0155a4acca21c53 /examples/main | |
| parent | 4d719a6d4e74b9a98e75f826f865f3153717d54b (diff) | |
build : link against build info instead of compiling against it (#3879)
* cmake : fix build when .git does not exist
* cmake : simplify BUILD_INFO target
* cmake : add missing dependencies on BUILD_INFO
* build : link against build info instead of compiling against it
* zig : make build info a .cpp source instead of a header
Co-authored-by: Matheus C. França <matheus-catarino@hotmail.com>
* cmake : revert change to CMP0115
---------
Co-authored-by: Matheus C. França <matheus-catarino@hotmail.com>
Diffstat (limited to 'examples/main')
| -rw-r--r-- | examples/main/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | examples/main/main.cpp | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/examples/main/CMakeLists.txt b/examples/main/CMakeLists.txt index cc188894..d532980b 100644 --- a/examples/main/CMakeLists.txt +++ b/examples/main/CMakeLists.txt @@ -3,6 +3,3 @@ add_executable(${TARGET} main.cpp) install(TARGETS ${TARGET} RUNTIME) target_link_libraries(${TARGET} PRIVATE common llama ${CMAKE_THREAD_LIBS_INIT}) target_compile_features(${TARGET} PRIVATE cxx_std_11) -if(TARGET BUILD_INFO) - add_dependencies(${TARGET} BUILD_INFO) -endif() diff --git a/examples/main/main.cpp b/examples/main/main.cpp index 8a43b6ab..8d985c82 100644 --- a/examples/main/main.cpp +++ b/examples/main/main.cpp @@ -2,7 +2,6 @@ #include "console.h" #include "llama.h" -#include "build-info.h" #include <cassert> #include <cinttypes> @@ -153,8 +152,8 @@ int main(int argc, char ** argv) { LOG_TEE("%s: warning: scaling RoPE frequency by %g.\n", __func__, params.rope_freq_scale); } - LOG_TEE("%s: build = %d (%s)\n", __func__, BUILD_NUMBER, BUILD_COMMIT); - LOG_TEE("%s: built with %s for %s\n", __func__, BUILD_COMPILER, BUILD_TARGET); + LOG_TEE("%s: build = %d (%s)\n", __func__, LLAMA_BUILD_NUMBER, LLAMA_COMMIT); + LOG_TEE("%s: built with %s for %s\n", __func__, LLAMA_COMPILER, LLAMA_BUILD_TARGET); if (params.seed == LLAMA_DEFAULT_SEED) { params.seed = time(NULL); |