diff options
| author | Matthew Bentham <matthew.bentham@arm.com> | 2019-02-22 17:30:32 +0000 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2019-02-22 17:30:45 +0000 |
| commit | d1ae3a632af09cd065d983a51c40916e2202121d (patch) | |
| tree | 67622db42845b21fd1bd0a9340aa45387ee8b4d3 | |
| parent | baded14fc01be6c529c4755cda0cb39a278f0b39 (diff) | |
| download | armnn-d1ae3a632af09cd065d983a51c40916e2202121d.tar.gz | |
IVGCVSW-2735 Fail build if TfLite parser or armnnSerializer can't be built
Change-Id: I39a2fee99218a0a31d8ce6c46d7cc1c0ca5b75d2
Signed-off-by: Matthew Bentham <matthew.bentham@arm.com>
| -rw-r--r-- | cmake/GlobalConfig.cmake | 39 |
1 files changed, 6 insertions, 33 deletions
diff --git a/cmake/GlobalConfig.cmake b/cmake/GlobalConfig.cmake index 15c1a7fdb2..ad4869370c 100644 --- a/cmake/GlobalConfig.cmake +++ b/cmake/GlobalConfig.cmake @@ -172,33 +172,15 @@ if(BUILD_TF_LITE_PARSER OR BUILD_ARMNN_SERIALIZER) find_path(FLATBUFFERS_INCLUDE_PATH flatbuffers/flatbuffers.h HINTS ${FLATBUFFERS_ROOT}/include /usr/local/include /usr/include) - if(NOT FLATBUFFERS_INCLUDE_PATH) - message(WARNING - "Couldn't find 'flatbuffers/flatbuffers.h' at ${FLATBUFFERS_ROOT}/include. \ - Disabling Tf Lite and Armnn Serializer support") - set(BUILD_TF_LITE_PARSER Off) - set(BUILD_ARMNN_SERIALIZER Off) - else() - message(STATUS "Flatbuffers headers are located at: ${FLATBUFFERS_INCLUDE_PATH}") - endif() + message(STATUS "Flatbuffers headers are located at: ${FLATBUFFERS_INCLUDE_PATH}") find_library(FLATBUFFERS_LIBRARY NAMES libflatbuffers.a flatbuffers HINTS ${FLATBUFFERS_ROOT}/lib /usr/local/lib /usr/lib) - if(NOT FLATBUFFERS_LIBRARY) - message(WARNING - "Couldn't find flatbuffers library. Disabling Tf Lite and Armnn Serializer support") - set(BUILD_TF_LITE_PARSER Off) - set(BUILD_ARMNN_SERIALIZER Off) - else() - message(STATUS "Flatbuffers library located at: ${FLATBUFFERS_LIBRARY}") - endif() + message(STATUS "Flatbuffers library located at: ${FLATBUFFERS_LIBRARY}") - # Setup includes and libs only if we still want Tf Lite or Armnn Serializer - if(BUILD_TF_LITE_PARSER OR BUILD_ARMNN_SERIALIZER) - include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") - endif() + include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") endif() # Flatbuffers schema support for TF Lite @@ -207,19 +189,10 @@ if(BUILD_TF_LITE_PARSER) schema_generated.h HINTS ${TF_LITE_GENERATED_PATH}) - if(NOT TF_LITE_SCHEMA_INCLUDE_PATH) - message(WARNING - "Couldn't find 'schema_generated.h' at ${TF_LITE_GENERATED_PATH}. Disabling Tf Lite support") - set(BUILD_TF_LITE_PARSER Off) - else() - message(STATUS "Tf Lite generated header found at: ${TF_LITE_SCHEMA_INCLUDE_PATH}") - endif() + message(STATUS "Tf Lite generated header found at: ${TF_LITE_SCHEMA_INCLUDE_PATH}") - # Setup includes and libs only if we still want Tf Lite - if(BUILD_TF_LITE_PARSER) - add_definitions(-DARMNN_TF_LITE_PARSER) - add_definitions(-DARMNN_TF_LITE_SCHEMA_PATH="${TF_LITE_SCHEMA_INCLUDE_PATH}/schema.fbs") - endif() + add_definitions(-DARMNN_TF_LITE_PARSER) + add_definitions(-DARMNN_TF_LITE_SCHEMA_PATH="${TF_LITE_SCHEMA_INCLUDE_PATH}/schema.fbs") endif() if(BUILD_ARMNN_SERIALIZER) |