From 507df9d1df2d8c8f898ba6e77d05a011de578722 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=98=A4=ED=98=95=EC=84=9D/On-Device=20Lab=28SR=29/Staff?= =?utf8?q?=20Engineer/=EC=82=BC=EC=84=B1=EC=A0=84=EC=9E=90?= Date: Mon, 5 Aug 2019 17:47:59 +0900 Subject: [PATCH] Use option for coverage and test build flag (#6224) Use cmake option to set ENABLE_TEST and ENABLE_COVERAGE Signed-off-by: Hyeongseok Oh --- infra/nncc/CMakeLists.txt | 10 ++-------- infra/nnfw/CMakeLists.txt | 9 +-------- infra/nnfw/cmake/CfgOptionFlags.cmake | 1 + 3 files changed, 4 insertions(+), 16 deletions(-) diff --git a/infra/nncc/CMakeLists.txt b/infra/nncc/CMakeLists.txt index f60799c..12b8406 100644 --- a/infra/nncc/CMakeLists.txt +++ b/infra/nncc/CMakeLists.txt @@ -96,19 +96,13 @@ option(BUILD_GTEST "Build Google Test from the downloaded source" ON) nncc_find_package(GTest QUIET) -if(NOT DEFINED ENABLE_TEST) - # Enable test by default - set(ENABLE_TEST ${GTest_FOUND}) -endif(NOT DEFINED ENABLE_TEST) +option(ENABLE_TEST "Build Tests using Google Test" ${GTest_FOUND}) if(${ENABLE_TEST} AND NOT ${GTest_FOUND}) message(FATAL_ERROR "Google Test is required to enable test") endif(${ENABLE_TEST} AND NOT ${GTest_FOUND}) -if(NOT DEFINED ENABLE_COVERAGE) - set(ENABLE_COVERAGE FALSE) -endif(NOT DEFINED ENABLE_COVERAGE) - +option(ENABLE_COVERAGE "Build for coverage test" OFF) if(${ENABLE_COVERAGE} AND NOT ${ENABLE_TEST}) message(FATAL_ERROR "Test should be enabled to measure test coverage") endif(${ENABLE_COVERAGE} AND NOT ${ENABLE_TEST}) diff --git a/infra/nnfw/CMakeLists.txt b/infra/nnfw/CMakeLists.txt index 1a93d03..868381a 100644 --- a/infra/nnfw/CMakeLists.txt +++ b/infra/nnfw/CMakeLists.txt @@ -57,19 +57,12 @@ include("cmake/CfgOptionFlags.cmake") nnfw_find_package(GTest QUIET) -if(NOT DEFINED ENABLE_TEST) - # Enable test by default - set(ENABLE_TEST ${GTest_FOUND}) -endif(NOT DEFINED ENABLE_TEST) +option(ENABLE_TEST "Build Tests using Google Test" ${GTest_FOUND}) if(${ENABLE_TEST} AND NOT ${GTest_FOUND}) message(FATAL_ERROR "Google Test is required to enable test") endif(${ENABLE_TEST} AND NOT ${GTest_FOUND}) -if(NOT DEFINED ENABLE_COVERAGE) - set(ENABLE_COVERAGE FALSE) -endif(NOT DEFINED ENABLE_COVERAGE) - if(${ENABLE_COVERAGE} AND NOT ${ENABLE_TEST}) message(FATAL_ERROR "Test should be enabled to measure test coverage") endif(${ENABLE_COVERAGE} AND NOT ${ENABLE_TEST}) diff --git a/infra/nnfw/cmake/CfgOptionFlags.cmake b/infra/nnfw/cmake/CfgOptionFlags.cmake index 4cc3c94..7041626 100644 --- a/infra/nnfw/cmake/CfgOptionFlags.cmake +++ b/infra/nnfw/cmake/CfgOptionFlags.cmake @@ -58,3 +58,4 @@ option(BUILD_BOOST "Build boost source" OFF) # option(BUILD_GTEST "Download and build Google Test" ON) option(ENABLE_STRICT_BUILD "Treat warning as error" ON) +option(ENABLE_COVERAGE "Build for coverage test" OFF) -- 2.7.4