From 452fc784d1cb0c75240e9d986c985b6ddaa7ea18 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EB=B0=95=EC=A2=85=ED=98=84/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Mon, 18 Mar 2019 10:29:09 +0900 Subject: [PATCH] Do NOT use CMAKE_CURRENT_SOURCE_DIR for tflite build (#4761) The current tflite build script uses the hardcoded location of TensorFlow source code. This commit removes such hardcoded location and uses TensorFlowSource_DIR variable instead. Signed-off-by: Jonghyun Park --- externals/CMakeLists.txt | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/externals/CMakeLists.txt b/externals/CMakeLists.txt index 4ef3d21..ce6d3cb 100644 --- a/externals/CMakeLists.txt +++ b/externals/CMakeLists.txt @@ -3,9 +3,6 @@ if(NOT BUILD_TENSORFLOW_LITE) return() endif(NOT BUILD_TENSORFLOW_LITE) -set(TENSORFLOW_BASE ${CMAKE_CURRENT_SOURCE_DIR}/tensorflow) -set(TENSORFLOW_LITE_BASE ${TENSORFLOW_BASE}/tensorflow/contrib/lite) - # Required source & package nnfw_find_package(AbslSource REQUIRED) nnfw_find_package(Eigen REQUIRED) @@ -14,6 +11,8 @@ nnfw_find_package(FlatBuffersSource REQUIRED) nnfw_find_package(GEMMLowpSource REQUIRED) nnfw_find_package(TensorFlowSource REQUIRED) +set(TENSORFLOW_LITE_BASE ${TensorFlowSource_DIR}/tensorflow/contrib/lite) + # # Tensorflow Lite library # @@ -49,7 +48,7 @@ list(APPEND TFLITE_SRCS ${TFLITE_PROFILING_SRCS}) list(APPEND TFLITE_SRCS "${FarmhashSource_DIR}/src/farmhash.cc") -list(APPEND TFLITE_INCLUDES "${CMAKE_CURRENT_SOURCE_DIR}/tensorflow") +list(APPEND TFLITE_INCLUDES "${TensorFlowSource_DIR}") list(APPEND TFLITE_INCLUDES "${AbslSource_DIR}") list(APPEND TFLITE_INCLUDES "${GEMMLowpSource_DIR}") list(APPEND TFLITE_INCLUDES "${FarmhashSource_DIR}/src") -- 2.7.4