Remove `target_include_directories` for NEURUN_INCLUDE_DIR.
However variable NEURUN_INCLUDE_DIR cannot be removed for now since
cpu/acl_cl kernel module improperly depend on this dir.
Signed-off-by: Hanjoung Lee <hanjoung.lee@samsung.com>
# Add cpu
+# TODO Remove this variable as adding include dirs is done with target_link_libraries
+# (currently used by cpu/acl_cl kernel module which is not proper)
set(NEURUN_INCLUDE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/core/include)
# Build backends and their kernels
add_library(${LIB_NEURUN_BACKEND_ACL_CL} SHARED ${SOURCES})
-target_include_directories(${LIB_NEURUN_BACKEND_ACL_CL} PUBLIC ${NEURUN_INCLUDE_DIR})
target_include_directories(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} nnapi-header)
target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} arm_compute)
target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} arm_compute_ex)
target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} ${LIB_NEURUN_KERNEL_ACL_CL})
-target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} ${LIB_NEURUN})
+target_link_libraries(${LIB_NEURUN_BACKEND_ACL_CL} neurun-core)
target_compile_options(${LIB_NEURUN_BACKEND_ACL_CL} PRIVATE -Wall -Wextra -Werror)
add_library(${LIB_NEURUN_BACKEND_CPU} SHARED ${SOURCES})
-target_include_directories(${LIB_NEURUN_BACKEND_CPU} PUBLIC ${NEURUN_INCLUDE_DIR})
target_include_directories(${LIB_NEURUN_BACKEND_CPU} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow)
target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnapi-header)
target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_lib_misc)
target_link_libraries(${LIB_NEURUN_BACKEND_CPU} nnfw_lib_cpp14)
target_link_libraries(${LIB_NEURUN_BACKEND_CPU} ${LIB_NEURUN_KERNEL_CPU})
-target_link_libraries(${LIB_NEURUN_BACKEND_CPU} ${LIB_NEURUN})
+target_link_libraries(${LIB_NEURUN_BACKEND_CPU} neurun-core)
target_compile_options(${LIB_NEURUN_BACKEND_CPU} PRIVATE -Wall -Wextra -Werror)
file(GLOB_RECURSE SOURCES_FRONTEND "*.cc")
add_library(${LIB_NEURUN} SHARED ${SOURCES_FRONTEND})
-target_include_directories(${LIB_NEURUN} PUBLIC ${NEURUN_INCLUDE_DIR})
target_include_directories(${LIB_NEURUN} PUBLIC ${CMAKE_SOURCE_DIR}/externals/tensorflow)
target_link_libraries(${LIB_NEURUN} nnapi-header)
target_link_libraries(${LIB_NEURUN} neurun-core)