diff options
| author | Sadik Armagan <sadik.armagan@arm.com> | 2020-03-09 11:04:32 +0000 |
|---|---|---|
| committer | Sadik Armagan <sadik.armagan@arm.com> | 2020-03-09 11:05:25 +0000 |
| commit | 6f86b69989de2469c0d7cac4c685cd081e6cf812 (patch) | |
| tree | de2e6a13107f152bfc7555db7dba404ace797bb1 /CMakeLists.txt | |
| parent | 4d4e0e2530629ae9ecfcb379bf0f27c6b18b6891 (diff) | |
| download | armnn-6f86b69989de2469c0d7cac4c685cd081e6cf812.tar.gz | |
IVGCVSW-4540 Fix master build failure to link UnitTests on Android
Change-Id: I22148a0bf243eabfd045475644510f30096d96e3
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 046ef834ec..8d63e43c04 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -868,10 +868,15 @@ if(BUILD_UNIT_TESTS) if(BUILD_GATORD_MOCK) list(APPEND unittest_sources tests/profiling/gatordmock/tests/GatordMockTests.cpp - src/timelineDecoder/tests/TimelineTests.cpp ) endif() + if(BUILD_TIMELINE_DECODER) + list(APPEND unittest_sources + src/timelineDecoder/tests/TimelineTests.cpp + ) + endif() + foreach(lib ${armnnUnitTestLibraries}) message(STATUS "Adding object library dependency to UnitTests: ${lib}") list(APPEND unittest_sources $<TARGET_OBJECTS:${lib}>) @@ -882,6 +887,7 @@ if(BUILD_UNIT_TESTS) target_include_directories(UnitTests PRIVATE src/armnnUtils) target_include_directories(UnitTests PRIVATE src/backends) target_include_directories(UnitTests PRIVATE src/profiling) + target_include_directories(UnitTests PRIVATE src/timelineDecoder) if(VALGRIND_FOUND) if(HEAP_PROFILING OR LEAK_CHECKING) @@ -904,6 +910,9 @@ if(BUILD_UNIT_TESTS) if(BUILD_GATORD_MOCK) target_link_libraries(UnitTests gatordMockService) + endif() + + if(BUILD_TIMELINE_DECODER) target_link_libraries(UnitTests timelineDecoder) endif() @@ -990,7 +999,7 @@ if(BUILD_GATORD_MOCK) tests/profiling/gatordmock/StreamMetadataCommandHandler.hpp ) - include_directories(src/timelineDecoder src/profiling tests/profiling tests/profiling/gatordmock) + include_directories(src/profiling tests/profiling tests/profiling/gatordmock) add_library_ex(gatordMockService STATIC ${gatord_mock_sources}) target_include_directories(gatordMockService PRIVATE src/armnnUtils) |