Fix include dir setting in cmake (#3881)

Remove libs/util/include in NNFW_INCLUDE_DIR list
Fix cmake include for libs/util
Fix cmake link for neurun cpu kernel

Signed-off-by: Hyeongseok Oh <hseok82.oh@samsung.com>

diff --git a/cmake/option/option_linux.cmake b/cmake/option/option_linux.cmake
index 8d2eba7..8cae4e9 100644 (file)
--- a/cmake/option/option_linux.cmake
+++ b/cmake/option/option_linux.cmake
@@ -24,7 +24,7 @@ endif()
 set(LIB_PTHREAD pthread)
 
 # nnfw common path
-set(NNFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include ${CMAKE_SOURCE_DIR}/libs/util/include)
+set(NNFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
 set(NNFW_EXTERNALS_DIR ${CMAKE_SOURCE_DIR}/externals)
 
 # External sources to build tflite

diff --git a/libs/util/CMakeLists.txt b/libs/util/CMakeLists.txt
index eaa7ae8..718a096 100644 (file)
--- a/libs/util/CMakeLists.txt
+++ b/libs/util/CMakeLists.txt
@@ -9,10 +9,10 @@ if(BUILD_TFLITE_BENCHMARK_MODEL)
 endif()
 
 add_library(nnfw_util SHARED ${NNFW_UTILITY_SRCS})
-target_include_directories(nnfw_util PUBLIC ${NNFW_INCLUDE_DIR})
+target_include_directories(nnfw_util PUBLIC ${NNFW_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 
 add_library(static_nnfw_util STATIC ${NNFW_UTILITY_SRCS})
-target_include_directories(static_nnfw_util PUBLIC ${NNFW_INCLUDE_DIR})
+target_include_directories(static_nnfw_util PUBLIC ${NNFW_INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/include)
 set_target_properties(static_nnfw_util PROPERTIES POSITION_INDEPENDENT_CODE ON)
 
 install(TARGETS nnfw_util

diff --git a/runtimes/neurun/src/kernel/cpu/CMakeLists.txt b/runtimes/neurun/src/kernel/cpu/CMakeLists.txt
index dddf154..542d462 100644 (file)
--- a/runtimes/neurun/src/kernel/cpu/CMakeLists.txt
+++ b/runtimes/neurun/src/kernel/cpu/CMakeLists.txt
@@ -8,6 +8,7 @@ target_include_directories(${LIB_NEURUN_KERNEL_CPU} PUBLIC ${CMAKE_SOURCE_DIR}/e
 
 target_link_libraries(${LIB_NEURUN_KERNEL_CPU} arm_compute) # TODO We should not need this
 target_link_libraries(${LIB_NEURUN_KERNEL_CPU} tensorflow-lite)
+target_link_libraries(${LIB_NEURUN_KERNEL_CPU} nnfw_util)
 
 set_target_properties(${LIB_NEURUN_KERNEL_CPU} PROPERTIES POSITION_INDEPENDENT_CODE ON)
 set_target_properties(${LIB_NEURUN_KERNEL_CPU} PROPERTIES OUTPUT_NAME kernel_cpu)