From 6f8a32abb0735e073e7705a109317d731701673d 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, 11 Mar 2019 13:51:00 +0900 Subject: [PATCH] Introduce BUILD_TOOLS options (#4654) This commit introduces BUILD_TOOLS option and partially removes the the occurence of OBS_BUILD in CMakeLists.txt by using this BUILD_TOOLS option. Signed-off-by: Jonghyun Park --- CMakeLists.txt | 3 +++ Makefile | 1 + tools/CMakeLists.txt | 4 ++-- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 15fa924..02b5257 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -59,6 +59,9 @@ option(DOWNLOAD_NONIUS "Download nonius source" ON) option(DOWNLOAD_BOOST "Download boost source" OFF) option(BUILD_BOOST "Build boost source" OFF) +# Project configuration +option(BUILD_TOOLS "Bulid nnfw projects under tools/" ON) + # GTest support option(BUILD_GTEST "Download and build Google Test" ON) nnfw_find_package(GTest QUIET) diff --git a/Makefile b/Makefile index a254fe8..56eaa07 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ endif ifneq ($(OBS_BUILD),OFF) OPTIONS+= -DBUILD_ARMCOMPUTE=FALSE + OPTIONS+= -DBUILD_TOOLS=FALSE endif ifeq ($(GENERATE_NNAPI_TESTS),1) diff --git a/tools/CMakeLists.txt b/tools/CMakeLists.txt index 7181629..a498d90 100644 --- a/tools/CMakeLists.txt +++ b/tools/CMakeLists.txt @@ -1,6 +1,6 @@ -if(OBS_BUILD) +if(NOT BUILD_TOOLS) return() -endif(OBS_BUILD) +endif(NOT BUILD_TOOLS) add_subdirectory(nnapi_quickcheck) add_subdirectory(opencl_tool) -- 2.7.4