From 0d87fe9c14a7e9a6af2694ae1745953010dfb1b9 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?= Date: Thu, 19 Jul 2018 12:02:17 +0900 Subject: [PATCH] Tidy cmake, separate configuration flags (#2008) This will extract configuration flags to separate file Signed-off-by: SaeHie Park --- CMakeLists.txt | 22 +--------------------- cmake/CfgOptionFlags.cmake | 22 ++++++++++++++++++++++ 2 files changed, 23 insertions(+), 21 deletions(-) create mode 100644 cmake/CfgOptionFlags.cmake diff --git a/CMakeLists.txt b/CMakeLists.txt index 80437d3..1fc340b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -30,28 +30,8 @@ foreach(FLAG ${FLAGS_CXXONLY}) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${FLAG}") endforeach() -# # Configuration flags -# -option(BUILD_ACL "Build ARM Compute Library" OFF) -option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) -option(BUILD_ACL_STATIC_LIB "Build ARM Comput Static Library" OFF) -option(BUILD_BENCHMARK_ACL "Build ARM Compute Library Benchmarks" OFF) -option(BUILD_NN_RUNTIME "Build NN Runtime" OFF) -option(BUILD_NEW_RUNTIME "Build New Runtime" OFF) #if implementation is done, it would replace nn runtime. -option(BUILD_LABS "Build lab projects" ON) -option(BUILD_ANDROID_NN_RUNTIME_TEST "Build Android NN Runtime Test" ON) -option(BUILD_DETECTION_APP "Build detection example app" OFF) - -if("${TARGET_ARCH}" STREQUAL "armv7l" AND NOT "${TARGET_OS}" STREQUAL "tizen") - set(BUILD_PURE_ARM_COMPUTE ON) -endif() - -# On x86, disable pureacl/new runtine build which depends on arm compute library -if("${TARGET_ARCH}" STREQUAL "x86_64") - set(BUILD_PURE_ARM_COMPUTE OFF) - set(BUILD_NEW_RUNTIME OFF) -endif() +include("cmake/CfgOptionFlags.cmake") # NOTE '${CMAKE_INSTALL_PREFIX}/lib' should be added as a link directory as # CI server places pre-built ARM compute libraries on this directory. diff --git a/cmake/CfgOptionFlags.cmake b/cmake/CfgOptionFlags.cmake new file mode 100644 index 0000000..2abd102 --- /dev/null +++ b/cmake/CfgOptionFlags.cmake @@ -0,0 +1,22 @@ +# +# Configuration flags +# +option(BUILD_ACL "Build ARM Compute Library" OFF) +option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON) +option(BUILD_ACL_STATIC_LIB "Build ARM Comput Static Library" OFF) +option(BUILD_BENCHMARK_ACL "Build ARM Compute Library Benchmarks" OFF) +option(BUILD_NN_RUNTIME "Build NN Runtime" OFF) +option(BUILD_NEW_RUNTIME "Build New Runtime" OFF) #if implementation is done, it would replace nn runtime. +option(BUILD_LABS "Build lab projects" ON) +option(BUILD_ANDROID_NN_RUNTIME_TEST "Build Android NN Runtime Test" ON) +option(BUILD_DETECTION_APP "Build detection example app" OFF) + +if("${TARGET_ARCH}" STREQUAL "armv7l" AND NOT "${TARGET_OS}" STREQUAL "tizen") + set(BUILD_PURE_ARM_COMPUTE ON) +endif() + +# On x86, disable pureacl/new runtine build which depends on arm compute library +if("${TARGET_ARCH}" STREQUAL "x86_64") + set(BUILD_PURE_ARM_COMPUTE OFF) + set(BUILD_NEW_RUNTIME OFF) +endif() -- 2.7.4