From 679daed1c39563c92afd91a0234776ba3606bfd2 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: Tue, 12 Mar 2019 14:32:44 +0900 Subject: [PATCH] Introduce BUILD_LOGGING option (#4679) This commit introduces BUILD_LOGGING option which allows users to enable/disable logging runtime build, and updates CMakeLists.txt to use it instead of OBS_BUILD. Signed-off-by: Jonghyun Park --- Makefile | 2 ++ cmake/CfgOptionFlags.cmake | 1 + runtimes/CMakeLists.txt | 4 ++-- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f57d77a..c4ff4d1 100644 --- a/Makefile +++ b/Makefile @@ -58,6 +58,8 @@ ifneq ($(OBS_BUILD),OFF) OPTIONS+= -DBUILD_ARMCOMPUTE=FALSE # Use pre-installed tensorflow lite library OPTIONS+= -DBUILD_TENSORFLOW_LITE=FALSE + # Disable logging runtime build for Tizen + OPTIONS+= -DBUILD_LOGGING=FALSE OPTIONS+= -DBUILD_TOOLS=FALSE # Disable "tflite-run" and "tflite_benchmark_model" for Tizen OPTIONS+= -DBUILD_TFLITE_RUN=FALSE diff --git a/cmake/CfgOptionFlags.cmake b/cmake/CfgOptionFlags.cmake index 91a6867..fba043a 100644 --- a/cmake/CfgOptionFlags.cmake +++ b/cmake/CfgOptionFlags.cmake @@ -6,6 +6,7 @@ include(CMakeDependentOption) option(BUILD_EXT_MULTITHREAD "Build external build using multi thread" ON) option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) option(BUILD_NEURUN "Build neurun" OFF) #if implementation is done, it would replace nn runtime. +option(BUILD_LOGGING "Build logging runtime" ON) CMAKE_DEPENDENT_OPTION(BUILD_RUNTIME_NNAPI_TEST "Build Runtime NN API Generated Test" # Set BUILD_RUNTIME_NNAPI_TEST as ON # if CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.2 diff --git a/runtimes/CMakeLists.txt b/runtimes/CMakeLists.txt index e8ee9ff..2f1a972 100644 --- a/runtimes/CMakeLists.txt +++ b/runtimes/CMakeLists.txt @@ -8,6 +8,6 @@ if(BUILD_PURE_ARM_COMPUTE) add_subdirectory(pure_arm_compute) endif() -if(NOT OBS_BUILD) +if(BUILD_LOGGING) add_subdirectory(logging) -endif(NOT OBS_BUILD) +endif(BUILD_LOGGING) -- 2.7.4