Always build generated NNAPI tests (#4664)

With this commit, generated NNAPI tests are always built when NNAPI test
build is enabled.

Signed-off-by: Jonghyun Park <jh1302.park@samsung.com>

diff --git a/cmake/CfgOptionFlags.cmake b/cmake/CfgOptionFlags.cmake
index 2fdc37f..380737a 100644 (file)
--- a/cmake/CfgOptionFlags.cmake
+++ b/cmake/CfgOptionFlags.cmake
@@ -1,10 +1,17 @@
+include(CMakeDependentOption)
+
 #
 # Configuration flags
 #
 option(BUILD_EXT_MULTITHREAD "Build external build using multi thread" ON)
 option(BUILD_PURE_ARM_COMPUTE "Build pure_arm_compute runtime" ON)
 option(BUILD_NEURUN "Build neurun" OFF) #if implementation is done, it would replace nn runtime.
-option(BUILD_RUNTIME_NNAPI_TEST "Build Runtime NN API Generated Test" ON)
+CMAKE_DEPENDENT_OPTION(BUILD_RUNTIME_NNAPI_TEST "Build Runtime NN API Generated Test"
+                       # Set BUILD_RUNTIME_NNAPI_TEST as ON
+                       #   if CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.2
+                       ON "CMAKE_COMPILER_IS_GNUCC;NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.2"
+                       # Otherwise set BUILD_RUNTIME_NNAPI_TEST as OFF
+                       OFF)
 option(BUILD_TFLITE_BENCHMARK_MODEL "Build tflite benchmark model" OFF)
 option(BUILD_NNAPI_QUICKCHECK "Build NN API Quickcheck tools" OFF)
 #

diff --git a/tests/nnapi/CMakeLists.txt b/tests/nnapi/CMakeLists.txt
index 4641d98..04a9b4c 100644 (file)
--- a/tests/nnapi/CMakeLists.txt
+++ b/tests/nnapi/CMakeLists.txt
@@ -16,15 +16,7 @@ set(GENERATED_TEST_SRC ${CMAKE_CURRENT_SOURCE_DIR}/src/TestGenerated_V1_0.cpp
                       ${CMAKE_CURRENT_SOURCE_DIR}/src/TestGenerated_V1_1.cpp
                       ${CMAKE_CURRENT_SOURCE_DIR}/src/TestGenerated_Ex.cpp)
 
-# g++-6.3 can build TestGenerated_XXX.cpp.
-if (CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.3)
-  set(RUNTIME_NNAPI_TEST_SRC ${RUNTIME_NNAPI_TEST_SRC} ${GENERATED_TEST_SRC})
-endif()
-
-# Both gbs and cross for tizen support building generated test
-if (OBS_BUILD)
-  set(RUNTIME_NNAPI_TEST_SRC ${RUNTIME_NNAPI_TEST_SRC} ${GENERATED_TEST_SRC})
-endif()
+set(RUNTIME_NNAPI_TEST_SRC ${RUNTIME_NNAPI_TEST_SRC} ${GENERATED_TEST_SRC})
 
 add_executable(${RUNTIME_NNAPI_TEST} ${RUNTIME_NNAPI_TEST_SRC})