diff options
| author | Ryan OShea <ryan.oshea3@arm.com> | 2023-03-20 11:10:40 +0000 |
|---|---|---|
| committer | Francis Murtagh <francis.murtagh@arm.com> | 2023-05-08 16:59:40 +0000 |
| commit | a3dc95ec2b0ac9e7f87dd32d03679a4b2a9b5d2a (patch) | |
| tree | f65bf6ebae620be85cd1122e32889b9e8b69e1b8 /src/armnnTfLiteParser | |
| parent | f6ed6d410dca0bbf22f338ca6e2fafd36d5c963f (diff) | |
| download | armnn-a3dc95ec2b0ac9e7f87dd32d03679a4b2a9b5d2a.tar.gz | |
Improve reusability of code that is defined out by cmake build paths
* Added new ARMNN_STUB_PROFILING and ARMNN_DISABLE_DYNAMIC_BACKEND
defines to replace BUILD_BARE_METAL and BUILD_EXECUTE_NETWORK_STATIC
* Add new CMake variables to disable sample apps and dynamic backends
* Improve BUILD_SHARED_LIBS CMake variable
* Add new archive output location to various libraries so that the
static libraries appear in the same location as the shared libraries
* Fixes for bare metal build
* Add ARMNN_DISABLE_FILE_SYSTEM defines to missing locations
Signed-off-by: Ryan OShea <ryan.oshea3@arm.com>
Change-Id: I1db9a8f483e7134bd261294b35240cf21b150d45
Diffstat (limited to 'src/armnnTfLiteParser')
| -rwxr-xr-x | src/armnnTfLiteParser/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/armnnTfLiteParser/CMakeLists.txt b/src/armnnTfLiteParser/CMakeLists.txt index 6096d1bf8c..782aa1ccee 100755 --- a/src/armnnTfLiteParser/CMakeLists.txt +++ b/src/armnnTfLiteParser/CMakeLists.txt @@ -11,14 +11,15 @@ if(BUILD_TF_LITE_PARSER) TfLiteParser.cpp ) - if(EXECUTE_NETWORK_STATIC) - add_library_ex(armnnTfLiteParser OBJECT ${armnn_tf_lite_parser_sources}) - else() + if(BUILD_SHARED_LIBS) add_library_ex(armnnTfLiteParser SHARED ${armnn_tf_lite_parser_sources}) + else() + add_library_ex(armnnTfLiteParser STATIC ${armnn_tf_lite_parser_sources}) endif() include_directories(SYSTEM "${FLATBUFFERS_INCLUDE_PATH}") set_target_properties(armnnTfLiteParser PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) + set_target_properties(armnnTfLiteParser PROPERTIES ARCHIVE_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR}) target_include_directories(armnnTfLiteParser PRIVATE ../armnn) target_include_directories(armnnTfLiteParser PRIVATE ../armnnUtils) target_include_directories(armnnTfLiteParser SYSTEM PRIVATE "${TF_LITE_SCHEMA_INCLUDE_PATH}") @@ -66,7 +67,6 @@ if(BUILD_TF_LITE_PARSER) endif() set_target_properties(armnnTfLiteParser PROPERTIES VERSION ${TFLITE_PARSER_LIB_VERSION} SOVERSION ${TFLITE_PARSER_LIB_SOVERSION} ) - install(TARGETS armnnTfLiteParser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) |