From 6a47e30f9cc8e7e316eee29d3eea0755e30f16f0 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/=EB=8F=99=EC=9E=91=EC=A0=9C?= =?utf8?q?=EC=96=B4Lab=28SR=29/Staff=20Engineer/=EC=82=BC=EC=84=B1?= =?utf8?q?=EC=A0=84=EC=9E=90?= Date: Wed, 5 Dec 2018 16:29:41 +0900 Subject: [PATCH] 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 --- cmake/option/option_linux.cmake | 2 +- libs/util/CMakeLists.txt | 4 ++-- runtimes/neurun/src/kernel/cpu/CMakeLists.txt | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/cmake/option/option_linux.cmake b/cmake/option/option_linux.cmake index 8d2eba7..8cae4e9 100644 --- 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 --- 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 --- 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) -- 2.7.4