From 5373539dcd15789bfe1a5d6ef100772f2a0adb19 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=EC=9D=B4=EC=83=81=EA=B7=9C/=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: Mon, 16 Apr 2018 13:29:44 +0900 Subject: [PATCH] Tizen gbs build TestGenerated from Android NN test (#678) Tizen gbs uses g++-6.2, which had been applied with most g++-6.3. In case of tizen gbs build, g++-6.2 would be ok. Signed-off-by: Sanggyu Lee --- src/runtime/test/CMakeLists.txt | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/runtime/test/CMakeLists.txt b/src/runtime/test/CMakeLists.txt index 34e8c36..08d3de8 100644 --- a/src/runtime/test/CMakeLists.txt +++ b/src/runtime/test/CMakeLists.txt @@ -9,6 +9,14 @@ if (CMAKE_COMPILER_IS_GNUCC AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.3) set(RUNTIME_ANDROID_NN_TEST_SRC ${RUNTIME_ANDROID_NN_TEST_SRC} TestGenerated.cpp) endif() +# g++-6.2 for tizen can build TestGenerated.cpp. +# Tizen has g++ 6.2 applied most of 6++ 6.3 patches. +if (${TARGET_OS} STREQUAL "tizen") + if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 6.2) + set(RUNTIME_ANDROID_NN_TEST_SRC ${RUNTIME_ANDROID_NN_TEST_SRC} TestGenerated.cpp) + endif() +endif() + add_executable(${RUNTIME_ANDROID_NN_TEST} ${RUNTIME_ANDROID_NN_TEST_SRC}) if (NOT ${TARGET_OS} STREQUAL "tizen") -- 2.7.4