From: 이한종/On-Device Lab(SR)/Engineer/삼성전자 <hanjoung.lee@samsung.com>
Date: Wed, 20 Mar 2019 02:11:50 +0000 (+0900)
Subject: [neurun] Remove unnecessary target include dirs (#4787)
X-Git-Tag: submit/tizen/20190325.013700~24
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c775b63928f2bb29dfab8d4b28094d2a442e96b1;p=platform%2Fcore%2Fml%2Fnnfw.git

[neurun] Remove unnecessary target include dirs (#4787)

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>
---

diff --git a/runtimes/neurun/CMakeLists.txt b/runtimes/neurun/CMakeLists.txt
index 0954d63..a8b970d 100644
--- a/runtimes/neurun/CMakeLists.txt
+++ b/runtimes/neurun/CMakeLists.txt
@@ -1,5 +1,7 @@
 # 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
diff --git a/runtimes/neurun/backend/acl_cl/CMakeLists.txt b/runtimes/neurun/backend/acl_cl/CMakeLists.txt
index af88fd5..365deac 100644
--- a/runtimes/neurun/backend/acl_cl/CMakeLists.txt
+++ b/runtimes/neurun/backend/acl_cl/CMakeLists.txt
@@ -10,14 +10,13 @@ list(REMOVE_ITEM SOURCES ${REMOVE_KERNEL_SOURCES})
 
 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)
 
diff --git a/runtimes/neurun/backend/cpu/CMakeLists.txt b/runtimes/neurun/backend/cpu/CMakeLists.txt
index 1483184..5a617ee 100644
--- a/runtimes/neurun/backend/cpu/CMakeLists.txt
+++ b/runtimes/neurun/backend/cpu/CMakeLists.txt
@@ -11,7 +11,6 @@ list(REMOVE_ITEM SOURCES ${REMOVE_KERNEL_SOURCES})
 
 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)
@@ -19,7 +18,7 @@ target_link_libraries(${LIB_NEURUN_BACKEND_CPU} tensorflow-lite)
 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)
 
diff --git a/runtimes/neurun/frontend/nnapi/CMakeLists.txt b/runtimes/neurun/frontend/nnapi/CMakeLists.txt
index 7c5ea9c..001fa72 100644
--- a/runtimes/neurun/frontend/nnapi/CMakeLists.txt
+++ b/runtimes/neurun/frontend/nnapi/CMakeLists.txt
@@ -1,7 +1,6 @@
 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)