Skip to content

Commit b1108f6

Browse files
batcheuhseok-oh
andauthored
[onert] Use PkgConfig cmake module to find TRIXEngine (#15273)
This commit replaces the use of the private cmake with the PkgConfig module. It will prevent a potential build failure caused by varying library paths. ONE-DCO-1.0-Signed-off-by: Jonghwa Lee <jonghwa3.lee@samsung.com> Co-authored-by: Hyeongseok Oh <hseok82.oh@samsung.com>
1 parent 0058ea4 commit b1108f6

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

runtime/onert/backend/trix/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
set(LIB_ONERT_BACKEND_TRIX onert_backend_trix)
22

3-
nnfw_find_package(TRIXEngine QUIET 2.5.0)
3+
find_package(PkgConfig REQUIRED)
4+
# TRIXEngine version is required to higher than 2.5.0
5+
pkg_check_modules(TRIXEngine QUIET IMPORTED_TARGET npu-engine>2.5.0)
6+
47
if(NOT TRIXEngine_FOUND)
58
message(STATUS "ONERT backend: Failed to find TRIXEngine")
69
return()
@@ -12,7 +15,7 @@ file(GLOB_RECURSE SOURCES "*.cc")
1215
add_library(${LIB_ONERT_BACKEND_TRIX} SHARED ${SOURCES})
1316

1417
target_link_libraries(${LIB_ONERT_BACKEND_TRIX} PRIVATE onert_core)
15-
target_link_libraries(${LIB_ONERT_BACKEND_TRIX} PRIVATE trix_engine)
18+
target_link_libraries(${LIB_ONERT_BACKEND_TRIX} PRIVATE PkgConfig::TRIXEngine)
1619
target_link_libraries(${LIB_ONERT_BACKEND_TRIX} PRIVATE nnfw_common)
1720
target_link_libraries(${LIB_ONERT_BACKEND_TRIX} PRIVATE nnfw_coverage)
1821

runtime/onert/loader/trix/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,10 @@ if (NOT BUILD_TRIX_LOADER)
22
return()
33
endif ()
44

5-
nnfw_find_package(TRIXEngine QUIET 2.5.0)
5+
find_package(PkgConfig REQUIRED)
6+
# TRIXEngine version is required to higher than 2.5.0
7+
pkg_check_modules(TRIXEngine QUIET IMPORTED_TARGET npu-engine>2.5.0)
8+
69
if(TRIXEngine_FOUND)
710
message(STATUS "ONERT frontend: Found TRIXEngine")
811
list(APPEND SOURCES TrixLoader.cc)
@@ -18,6 +21,6 @@ set_target_properties(tvn_loader PROPERTIES
1821
INSTALL_RPATH "$ORIGIN:$ORIGIN/..")
1922
target_link_libraries(tvn_loader PRIVATE onert_core)
2023
target_link_libraries(tvn_loader PRIVATE nnfw_common nnfw_coverage)
21-
target_link_libraries(tvn_loader PRIVATE trix_engine)
24+
target_link_libraries(tvn_loader PRIVATE PkgConfig::TRIXEngine)
2225

2326
install(TARGETS tvn_loader DESTINATION lib/nnfw/loader)

0 commit comments

Comments
 (0)