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/armnnSerializer/CMakeLists.txt | |
| 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/armnnSerializer/CMakeLists.txt')
| -rwxr-xr-x | src/armnnSerializer/CMakeLists.txt | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/armnnSerializer/CMakeLists.txt b/src/armnnSerializer/CMakeLists.txt index 582013178d..1239b03b6d 100755 --- a/src/armnnSerializer/CMakeLists.txt +++ b/src/armnnSerializer/CMakeLists.txt @@ -12,15 +12,16 @@ if(BUILD_ARMNN_SERIALIZER) 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 ArmnnSchema.fbs - COMMAND ${FLATC} -o ${CMAKE_CURRENT_BINARY_DIR} --cpp ${CMAKE_CURRENT_SOURCE_DIR}/ArmnnSchema.fbs + OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/../../generated/ArmnnSchema_generated.h DEPENDS ArmnnSchema.fbs + COMMAND ${FLATC} -o ${CMAKE_CURRENT_SOURCE_DIR}/../../generated --cpp ${CMAKE_CURRENT_SOURCE_DIR}/ArmnnSchema.fbs ) + set_property(SOURCE Serializer.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_serializer_sources) list(APPEND armnn_serializer_sources ../../include/armnnSerializer/ISerializer.hpp ../../include/armnnDeserializer/IDeserializer.hpp - ArmnnSchema_generated.h Serializer.hpp Serializer.cpp SerializerUtils.hpp @@ -36,9 +37,16 @@ if(BUILD_ARMNN_SERIALIZER) endif() include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") + set_target_properties(armnnSerializer PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + target_include_directories(armnnSerializer PRIVATE ../armnn) target_include_directories(armnnSerializer PRIVATE ../armnnUtils) + target_include_directories(armnnSerializer PRIVATE ../../generated) + + list(APPEND armnn_serializer_sources + ArmnnSchema_generated.h + ) # System include to suppress warnings for flatbuffers generated files target_include_directories(armnnSerializer SYSTEM PRIVATE ${CMAKE_CURRENT_BINARY_DIR}) |