File tree Expand file tree Collapse file tree 4 files changed +9
-8
lines changed
Expand file tree Collapse file tree 4 files changed +9
-8
lines changed Original file line number Diff line number Diff line change @@ -77,9 +77,11 @@ find_package(gflags REQUIRED)
7777# llama_main: test binary to run llama, with tokenizer and sampler integrated
7878#
7979
80- # find `executorch` libraries Same as for gflags
81- set (executorch_DIR ${CMAKE_CURRENT_BINARY_DIR} /../../../lib/cmake/ExecuTorch)
82- find_package (executorch CONFIG REQUIRED)
80+ # find `executorch` libraries. CMAKE_PREFIX_PATH would work for host
81+ # compilation, but CMAKE_FIND_ROOT_PATH appears to be necessary for
82+ # cross-compiling (e.g., to Android) to work as well.
83+ list (APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR} /../../..)
84+ find_package (executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH)
8385target_link_options_shared_lib(executorch)
8486
8587# llama_runner library
Original file line number Diff line number Diff line change @@ -76,8 +76,8 @@ find_package(gflags REQUIRED)
7676#
7777
7878# find `executorch` libraries Same as for gflags
79- set (executorch_DIR ${CMAKE_CURRENT_BINARY_DIR} /../../../lib/cmake/ExecuTorch )
80- find_package (executorch CONFIG REQUIRED)
79+ list ( APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR} /../../..)
80+ find_package (executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH )
8181target_link_options_shared_lib(executorch)
8282
8383# llava_runner library
Original file line number Diff line number Diff line change @@ -24,8 +24,8 @@ set(EXECUTORCH_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/../../..")
2424set (_common_include_directories
2525 ${EXECUTORCH_ROOT} /.. ${EXECUTORCH_ROOT} /runtime/core/portable_type/c10
2626)
27- set (executorch_DIR ${CMAKE_CURRENT_BINARY_DIR} /../../../lib/cmake/ExecuTorch )
28- find_package (executorch CONFIG REQUIRED)
27+ list ( APPEND CMAKE_FIND_ROOT_PATH ${CMAKE_CURRENT_BINARY_DIR} /../../..)
28+ find_package (executorch CONFIG REQUIRED FIND_ROOT_PATH_BOTH )
2929
3030target_link_options_shared_lib(executorch)
3131
Original file line number Diff line number Diff line change @@ -60,7 +60,6 @@ set_target_properties(fbjni PROPERTIES
6060 IMPORTED_LOCATION "${CMAKE_CURRENT_BINARY_DIR} /third-party/fbjni/prefab/modules/fbjni/libs/android.${ANDROID_ABI} /libfbjni.so"
6161)
6262
63- set (executorch_DIR ${CMAKE_CURRENT_BINARY_DIR} /../../lib/cmake/ExecuTorch)
6463target_link_options_shared_lib(executorch)
6564
6665add_library (executorch_jni SHARED jni/jni_layer.cpp jni/log .cpp jni/jni_layer_runtime.cpp)
You can’t perform that action at this time.
0 commit comments