diff options
author | Matteo Martincigh <matteo.martincigh@arm.com> | 2018-10-11 17:39:30 +0100 |
---|---|---|
committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:53 +0100 |
commit | 4423ac7fb7ec96c5fe88df2dd6de417c7d8b3709 (patch) | |
tree | 550438a77405a0186195924ba71ce32f32fd5b55 /CMakeLists.txt | |
parent | b6cce4f906864b3bf21e00320b1add6d6bdd4f56 (diff) | |
download | armnn-4423ac7fb7ec96c5fe88df2dd6de417c7d8b3709.tar.gz |
IVGCVSW-2000: (Fix) Backend-specific unit tests not being executed
* Also disabled the Compute_ArmComputeCl/L2Normalization1dNhwc test as it
fails due to a bug in ACL
Change-Id: If1e36bc04f606e6568e6a13cc77f8f51f5834997
Diffstat (limited to 'CMakeLists.txt')
-rw-r--r-- | CMakeLists.txt | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index dfda4d1d93..7325d40303 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -507,7 +507,12 @@ if(BUILD_UNIT_TESTS) ) endif() - add_executable_ex(UnitTests ${unittest_sources}) + foreach(lib ${armnnUnitTestLibraries}) + message("Adding library dependency to UnitTests: ${lib}") + list(APPEND unittest_sources $<TARGET_OBJECTS:${lib}>) + endforeach() + + add_executable(UnitTests ${unittest_sources}) target_include_directories(UnitTests PRIVATE src) target_include_directories(UnitTests PRIVATE src/armnn) target_include_directories(UnitTests PRIVATE src/armnnUtils) @@ -521,18 +526,12 @@ if(BUILD_UNIT_TESTS) endif() endif() - # the backends under src/backends extend the list of - # static libs UnitTests to link against - list(APPEND armnnUnitTestLibraries armnn armnnUtils) - - foreach(lib ${armnnUnitTestLibraries}) - target_link_libraries(UnitTests ${lib}) - message("Adding library dependency to UnitTests: ${lib}") - endforeach() - target_link_libraries(UnitTests ${CMAKE_THREAD_LIBS_INIT}) target_link_libraries(UnitTests ${Boost_UNIT_TEST_FRAMEWORK_LIBRARY} ${Boost_SYSTEM_LIBRARY} ${Boost_FILESYSTEM_LIBRARY}) + target_link_libraries(UnitTests armnn) + target_link_libraries(UnitTests armnnUtils) + if(BUILD_TF_PARSER) target_link_libraries(UnitTests armnnTfParser) endif() |