From 51203a67a8e843d3b64602d7a26fcee37e97d26b Mon Sep 17 00:00:00 2001
From: =?utf8?q?=EB=B0=95=EC=84=B8=ED=9D=AC/=EB=8F=99=EC=9E=91=EC=A0=9C?=
 =?utf8?q?=EC=96=B4Lab=28SR=29/Principal=20Engineer/=EC=82=BC=EC=84=B1?=
 =?utf8?q?=EC=A0=84=EC=9E=90?= <saehie.park@samsung.com>
Date: Wed, 18 Jul 2018 17:15:55 +0900
Subject: [PATCH] Tidy cmake, relocate variables and options (#1992)

This will move common options and variables to option_linux file
And remove unused ACL folder variables

Signed-off-by: SaeHie Park <saehie.park@samsung.com>
---
 CMakeLists.txt                  | 29 -----------------------------
 cmake/option/option_linux.cmake | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 29 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 09f6669..7287cde 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -11,21 +11,9 @@ set(CMAKE_CXX_STANDARD 11)
 # identify platform: HOST_PLATFORM, TARGET_PLATFORM and related
 include("cmake/option/identify_platform.cmake")
 
-# lib pthread as a variable (pthread must be disabled on android)
-set(LIB_PTHREAD pthread)
-
 # platform specific options
 include("cmake/option/option_${TARGET_PLATFORM}.cmake")
 
-# test-coverage build flag
-if("${COVERAGE_BUILD}" STREQUAL "1")
-  set(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE ON)
-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
-  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
-  set(CMAKE_EXE_LINKER_FLAGS
-    "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
-endif()
-
 # add common flags
 foreach(FLAG ${FLAGS_COMMON})
   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${FLAG}")
@@ -65,23 +53,6 @@ if("${TARGET_ARCH}" STREQUAL "x86_64")
   set(BUILD_NEW_RUNTIME OFF)
 endif()
 
-#
-# Common variables
-#
-set(NNFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
-set(NNFW_EXTERNALS_DIR ${CMAKE_SOURCE_DIR}/externals)
-set(TFLITE_DEPEND_DIR ${NNFW_EXTERNALS_DIR}/tensorflow/tensorflow/contrib/lite/downloads)
-
-if(NOT OBS_BUILD AND NOT "${TARGET_OS}" STREQUAL "android")
-  set(NNFW_ACL_FOLDER ${NNFW_EXTERNALS_DIR}/acl)
-  set(NNFW_ACL_INCLUDES ${NNFW_ACL_FOLDER}
-    ${NNFW_ACL_FOLDER}/include)
-else()
-  set(NNFW_ACL_FOLDER "")
-  set(NNFW_ACL_INCLUDES "")
-endif()
-set(NNFW_NN_RUNTIME_ROOT ${CMAKE_SOURCE_DIR}/runtimes/nn)
-
 # NOTE '${CMAKE_INSTALL_PREFIX}/lib' should be added as a link directory as
 #      CI server places pre-built ARM compute libraries on this directory.
 link_directories(${CMAKE_INSTALL_PREFIX}/lib)
diff --git a/cmake/option/option_linux.cmake b/cmake/option/option_linux.cmake
index ea533ec..1080ef2 100644
--- a/cmake/option/option_linux.cmake
+++ b/cmake/option/option_linux.cmake
@@ -7,3 +7,26 @@ set(CMAKE_C_FLAGS_DEBUG     "-O0 -g -DDEBUG")
 set(CMAKE_CXX_FLAGS_DEBUG   "-O0 -g -DDEBUG")
 set(CMAKE_C_FLAGS_RELEASE   "-O2 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
+
+# test-coverage build flag
+if("${COVERAGE_BUILD}" STREQUAL "1")
+  set(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE ON)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+  set(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS} -fprofile-arcs -ftest-coverage")
+  set(CMAKE_EXE_LINKER_FLAGS
+    "${CMAKE_EXE_LINKER_FLAGS} -fprofile-arcs -ftest-coverage")
+endif()
+
+#
+# linux common variable and settings
+#
+
+# lib pthread as a variable (pthread must be disabled on android)
+set(LIB_PTHREAD pthread)
+
+# nnfw common path
+set(NNFW_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/include)
+set(NNFW_EXTERNALS_DIR ${CMAKE_SOURCE_DIR}/externals)
+set(TFLITE_DEPEND_DIR ${NNFW_EXTERNALS_DIR}/tensorflow/tensorflow/contrib/lite/downloads)
+
+set(NNFW_NN_RUNTIME_ROOT ${CMAKE_SOURCE_DIR}/runtimes/nn)
-- 
2.7.4