diff options
| author | Mike Kelly <mike.kelly@arm.com> | 2022-05-20 17:18:59 +0100 |
|---|---|---|
| committer | Mike Kelly <mike.kelly@arm.com> | 2022-05-26 16:19:09 +0100 |
| commit | f74937eca3eece3ccd439933306ac0f32415390e (patch) | |
| tree | 39cc39c78f77f2b10c90ae8d583d9952175e57dc /src/armnnDeserializer | |
| parent | 5ee069ef6c4e7002ddc19ade8a1fbca7ba027d68 (diff) | |
| download | armnn-f74937eca3eece3ccd439933306ac0f32415390e.tar.gz | |
GitHub #644 fails to build with flatbuffers 2.0.6
* Removed the pre-generated ArmnnSchema_generated.h
* This version was generated using flatbuffers v1.12.0 and it contains
code that's incompatible with newer versions
* Android.mk will look for ArmnnSchema_generated.h in the armnnGenerated
directory in the armnn directory.
* The Serializer and Deserializer will look for ArmnnSchema_generated.h
in the armnnGenerated directory.
!android-nn-driver:7626
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Change-Id: I13ff6b6c78740cf1f82750f56caab83200e6a3e5
Signed-off-by: Mike Kelly <mike.kelly@arm.com>
Diffstat (limited to 'src/armnnDeserializer')
| -rwxr-xr-x | src/armnnDeserializer/CMakeLists.txt | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/armnnDeserializer/CMakeLists.txt b/src/armnnDeserializer/CMakeLists.txt index 198a9356b5..7ba83aae1e 100755 --- a/src/armnnDeserializer/CMakeLists.txt +++ b/src/armnnDeserializer/CMakeLists.txt @@ -12,13 +12,14 @@ if(BUILD_ARMNN_DESERIALIZER) add_custom_command( # Generate an ArmnnSchema_generated.h file if it doesn't exist, or update it when necessary otherwise - OUTPUT ArmnnSchema_generated.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../armnnSerializer/ArmnnSchema.fbs - COMMAND ${FLATC} -o ${CMAKE_CURRENT_BINARY_DIR} --cpp ${CMAKE_CURRENT_SOURCE_DIR}/../armnnSerializer/ArmnnSchema.fbs + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../../generated/ArmnnSchema_generated.h DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../armnnSerializer/ArmnnSchema.fbs + COMMAND ${FLATC} -o ${CMAKE_CURRENT_SOURCE_DIR}/../../generated --cpp ${CMAKE_CURRENT_SOURCE_DIR}/../armnnSerializer/ArmnnSchema.fbs ) + set_property(SOURCE Deserializer.cpp APPEND PROPERTY OBJECT_DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../../generated/ArmnnSchema_generated.h) + set_directory_properties(PROPERTIES ADDITIONAL_CLEAN_FILES ${CMAKE_CURRENT_SOURCE_DIR}/../../generated/) set(armnn_deserializer_sources) list(APPEND armnn_deserializer_sources - ArmnnSchema_generated.h Deserializer.hpp Deserializer.cpp ) @@ -26,9 +27,15 @@ if(BUILD_ARMNN_DESERIALIZER) add_library_ex(armnnDeserializer SHARED ${armnn_deserializer_sources}) include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") + set_target_properties(armnnDeserializer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) target_include_directories(armnnDeserializer PRIVATE ../armnn) target_include_directories(armnnDeserializer PRIVATE ../armnnUtils) + target_include_directories(armnnDeserializer PRIVATE ../../generated) + + list(APPEND armnn_deserializer_sources + ArmnnSchema_generated.h + ) # System include to suppress warnings for flatbuffers generated files target_include_directories(armnnDeserializer SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) |