diff options
| author | Chunseok Lee <chunseok.lee@samsung.com> | 2022-04-15 19:15:11 +0900 |
|---|---|---|
| committer | Chunseok Lee <chunseok.lee@samsung.com> | 2022-04-15 19:15:11 +0900 |
| commit | 3ad689f0803519e343c36d5700646e86059df961 (patch) | |
| tree | 862346c401a5577518fa7f042532aa931b53aa0e /compiler/enco | |
| parent | ac6e4dd7b480e83b586ef533d7b29a8a97eb48fe (diff) | |
| download | nnfw-3ad689f0803519e343c36d5700646e86059df961.tar.gz nnfw-3ad689f0803519e343c36d5700646e86059df961.tar.bz2 nnfw-3ad689f0803519e343c36d5700646e86059df961.zip | |
Imported Upstream version 1.20.0upstream/1.20.0submit/tizen/20220415.103159
Diffstat (limited to 'compiler/enco')
| -rw-r--r-- | compiler/enco/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | compiler/enco/core/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler/enco/frontend/caffe/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | compiler/enco/frontend/tflite/CMakeLists.txt | 11 |
4 files changed, 18 insertions, 14 deletions
diff --git a/compiler/enco/CMakeLists.txt b/compiler/enco/CMakeLists.txt index 17300e25e..3702f9501 100644 --- a/compiler/enco/CMakeLists.txt +++ b/compiler/enco/CMakeLists.txt @@ -1,4 +1,9 @@ add_subdirectory(core) add_subdirectory(frontend) add_subdirectory(cli) + +if(NOT ENABLE_TEST) + return() +endif(NOT ENABLE_TEST) + add_subdirectory(test) diff --git a/compiler/enco/core/CMakeLists.txt b/compiler/enco/core/CMakeLists.txt index 25dad2bc6..19a64231a 100644 --- a/compiler/enco/core/CMakeLists.txt +++ b/compiler/enco/core/CMakeLists.txt @@ -20,11 +20,11 @@ target_link_libraries(enco_core PRIVATE morph) # Let's use nncc project-wide build options target_link_libraries(enco_core PRIVATE nncc_common) -nnas_find_package(GTest QUIET) - -if(NOT GTest_FOUND) +if(NOT ENABLE_TEST) return() -endif(NOT GTest_FOUND) +endif(NOT ENABLE_TEST) + +nnas_find_package(GTest QUIET) add_executable(enco_core_test ${TESTS}) target_include_directories(enco_core_test PRIVATE src) diff --git a/compiler/enco/frontend/caffe/CMakeLists.txt b/compiler/enco/frontend/caffe/CMakeLists.txt index 9722392a1..baf7f7bd6 100644 --- a/compiler/enco/frontend/caffe/CMakeLists.txt +++ b/compiler/enco/frontend/caffe/CMakeLists.txt @@ -17,11 +17,11 @@ target_link_libraries(enco_caffe_frontend enco_intf_cmdline) target_link_libraries(enco_caffe_frontend morph) target_link_libraries(enco_caffe_frontend caffeproto) -nnas_find_package(GTest QUIET) - -if(NOT GTest_FOUND) +if(NOT ENABLE_TEST) return() -endif(NOT GTest_FOUND) +endif(NOT ENABLE_TEST) + +nnas_find_package(GTest QUIET) nnas_find_package(Caffe QUIET) diff --git a/compiler/enco/frontend/tflite/CMakeLists.txt b/compiler/enco/frontend/tflite/CMakeLists.txt index b2de2b34b..995e66f81 100644 --- a/compiler/enco/frontend/tflite/CMakeLists.txt +++ b/compiler/enco/frontend/tflite/CMakeLists.txt @@ -1,4 +1,4 @@ -nnas_find_package(FlatBuffers EXACT 1.10 QUIET) +nnas_find_package(FlatBuffers EXACT 2.0 QUIET) if(NOT FlatBuffers_FOUND) return() @@ -17,16 +17,15 @@ add_library(enco_tflite_frontend SHARED ${SOURCES}) target_include_directories(enco_tflite_frontend PRIVATE src) target_link_libraries(enco_tflite_frontend enco_intf_frontend) target_link_libraries(enco_tflite_frontend enco_intf_cmdline) -target_link_libraries(enco_tflite_frontend flatbuffers-1.10) target_link_libraries(enco_tflite_frontend enco_tflite_schema) target_link_libraries(enco_tflite_frontend morph) target_link_libraries(enco_tflite_frontend cwrap) -nnas_find_package(GTest QUIET) - -if(NOT GTest_FOUND) +if(NOT ENABLE_TEST) return() -endif(NOT GTest_FOUND) +endif(NOT ENABLE_TEST) + +nnas_find_package(GTest QUIET) add_executable(enco_tflite_frontend_test ${TESTS}) target_include_directories(enco_tflite_frontend_test PRIVATE src) |