Introduce BUILD_TOOLS options (#4654)
author박종현/On-Device Lab(SR)/Staff Engineer/삼성전자 <jh1302.park@samsung.com>
Mon, 11 Mar 2019 04:51:00 +0000 (13:51 +0900)
committer오형석/On-Device Lab(SR)/Staff Engineer/삼성전자 <hseok82.oh@samsung.com>
Mon, 11 Mar 2019 04:51:00 +0000 (13:51 +0900)
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 <jh1302.park@samsung.com>
CMakeLists.txt
Makefile
tools/CMakeLists.txt

index 15fa924..02b5257 100644 (file)
@@ -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)
index a254fe8..56eaa07 100644 (file)
--- 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)
index 7181629..a498d90 100644 (file)
@@ -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)