mirror of
https://github.com/ggerganov/llama.cpp.git
synced 2024-12-26 03:14:35 +00:00
Delete examples/llama.android/llama/CMakeLists.txt (#8165)
* Delete examples/llama.android/llama/CMakeLists.txt https://github.com/ggerganov/llama.cpp/pull/8145#issuecomment-2194534244 This file is not being used for building on Android. `llama.cpp/examples/llama.android/llama/src/main/cpp/CMakeLists.txt` is being used instead. * Update CMakeLists.txt Pick local llama.cpp files instead of fetching content from git
This commit is contained in:
parent
6030c61281
commit
387952651a
@ -1,55 +0,0 @@
|
|||||||
|
|
||||||
# For more information about using CMake with Android Studio, read the
|
|
||||||
# documentation: https://d.android.com/studio/projects/add-native-code.html.
|
|
||||||
# For more examples on how to use CMake, see https://github.com/android/ndk-samples.
|
|
||||||
|
|
||||||
# Sets the minimum CMake version required for this project.
|
|
||||||
cmake_minimum_required(VERSION 3.22.1)
|
|
||||||
|
|
||||||
# Declares the project name. The project name can be accessed via ${ PROJECT_NAME},
|
|
||||||
# Since this is the top level CMakeLists.txt, the project name is also accessible
|
|
||||||
# with ${CMAKE_PROJECT_NAME} (both CMake variables are in-sync within the top level
|
|
||||||
# build script scope).
|
|
||||||
project("llama-android")
|
|
||||||
|
|
||||||
## Fetch latest llama.cpp from GitHub
|
|
||||||
#include(FetchContent)
|
|
||||||
#FetchContent_Declare(
|
|
||||||
# llama
|
|
||||||
# GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
|
|
||||||
# GIT_TAG master
|
|
||||||
#)
|
|
||||||
#
|
|
||||||
## Also provides "common"
|
|
||||||
#FetchContent_MakeAvailable(llama)
|
|
||||||
|
|
||||||
# llama.cpp CI uses the code from the current branch
|
|
||||||
# ref: https://github.com/ggerganov/llama.cpp/pull/7341#issuecomment-2117617700
|
|
||||||
add_subdirectory(../../../../../../ build-llama)
|
|
||||||
|
|
||||||
# Creates and names a library, sets it as either STATIC
|
|
||||||
# or SHARED, and provides the relative paths to its source code.
|
|
||||||
# You can define multiple libraries, and CMake builds them for you.
|
|
||||||
# Gradle automatically packages shared libraries with your APK.
|
|
||||||
#
|
|
||||||
# In this top level CMakeLists.txt, ${CMAKE_PROJECT_NAME} is used to define
|
|
||||||
# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
|
|
||||||
# is preferred for the same purpose.
|
|
||||||
#
|
|
||||||
# In order to load a library into your app from Java/Kotlin, you must call
|
|
||||||
# System.loadLibrary() and pass the name of the library defined here;
|
|
||||||
# for GameActivity/NativeActivity derived applications, the same library name must be
|
|
||||||
# used in the AndroidManifest.xml file.
|
|
||||||
add_library(${CMAKE_PROJECT_NAME} SHARED
|
|
||||||
# List C/C++ source files with relative paths to this CMakeLists.txt.
|
|
||||||
llama-android.cpp)
|
|
||||||
|
|
||||||
# Specifies libraries CMake should link to your target library. You
|
|
||||||
# can link libraries from various origins, such as libraries defined in this
|
|
||||||
# build script, prebuilt third-party libraries, or Android system libraries.
|
|
||||||
target_link_libraries(${CMAKE_PROJECT_NAME}
|
|
||||||
# List libraries link to the target library
|
|
||||||
llama
|
|
||||||
common
|
|
||||||
android
|
|
||||||
log)
|
|
@ -11,15 +11,15 @@ cmake_minimum_required(VERSION 3.22.1)
|
|||||||
# build script scope).
|
# build script scope).
|
||||||
project("llama-android")
|
project("llama-android")
|
||||||
|
|
||||||
include(FetchContent)
|
#include(FetchContent)
|
||||||
FetchContent_Declare(
|
#FetchContent_Declare(
|
||||||
llama
|
# llama
|
||||||
GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
|
# GIT_REPOSITORY https://github.com/ggerganov/llama.cpp
|
||||||
GIT_TAG master
|
# GIT_TAG master
|
||||||
)
|
#)
|
||||||
|
|
||||||
# Also provides "common"
|
# Also provides "common"
|
||||||
FetchContent_MakeAvailable(llama)
|
#FetchContent_MakeAvailable(llama)
|
||||||
|
|
||||||
# Creates and names a library, sets it as either STATIC
|
# Creates and names a library, sets it as either STATIC
|
||||||
# or SHARED, and provides the relative paths to its source code.
|
# or SHARED, and provides the relative paths to its source code.
|
||||||
@ -30,6 +30,10 @@ FetchContent_MakeAvailable(llama)
|
|||||||
# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
|
# the target library name; in the sub-module's CMakeLists.txt, ${PROJECT_NAME}
|
||||||
# is preferred for the same purpose.
|
# is preferred for the same purpose.
|
||||||
#
|
#
|
||||||
|
|
||||||
|
#load local llama.cpp
|
||||||
|
add_subdirectory(../../../../../../ build-llama)
|
||||||
|
|
||||||
# In order to load a library into your app from Java/Kotlin, you must call
|
# In order to load a library into your app from Java/Kotlin, you must call
|
||||||
# System.loadLibrary() and pass the name of the library defined here;
|
# System.loadLibrary() and pass the name of the library defined here;
|
||||||
# for GameActivity/NativeActivity derived applications, the same library name must be
|
# for GameActivity/NativeActivity derived applications, the same library name must be
|
||||||
|
Loading…
Reference in New Issue
Block a user