diff options
| author | David Beck <david.beck@arm.com> | 2018-10-16 12:58:49 +0100 |
|---|---|---|
| committer | Matthew Bentham <matthew.bentham@arm.com> | 2018-10-22 16:57:54 +0100 |
| commit | 39fedf04d226360a8c77ca1ca3e2528a709101b5 (patch) | |
| tree | 46ddccdbcbbb1f886c79961f43635802bda4c7b5 /src/backends/cl | |
| parent | 430c6d6e7e4581f82aff47f10c72b586ac530a94 (diff) | |
| download | armnn-39fedf04d226360a8c77ca1ca3e2528a709101b5.tar.gz | |
IVGCVSW-2022 : fix for backend cmake files to respect BUILD_UNIT_TESTS variable
Change-Id: I8d34419742152edd50f1ec438e32d3ccc4f38351
Diffstat (limited to 'src/backends/cl')
| -rw-r--r-- | src/backends/cl/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | src/backends/cl/backend.cmake | 8 | ||||
| -rw-r--r-- | src/backends/cl/test/ClMemCopyTests.cpp | 3 |
3 files changed, 9 insertions, 7 deletions
diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt index 5704e0e8ab..d38fb68a0f 100644 --- a/src/backends/cl/CMakeLists.txt +++ b/src/backends/cl/CMakeLists.txt @@ -21,7 +21,10 @@ if(ARMCOMPUTECL) ) add_subdirectory(workloads) - add_subdirectory(test) + + if(BUILD_UNIT_TESTS) + add_subdirectory(test) + endif() endif() add_library(armnnClBackend OBJECT ${armnnClBackend_sources}) diff --git a/src/backends/cl/backend.cmake b/src/backends/cl/backend.cmake index f8a1c1c62a..eb62147335 100644 --- a/src/backends/cl/backend.cmake +++ b/src/backends/cl/backend.cmake @@ -3,12 +3,12 @@ # SPDX-License-Identifier: MIT # +add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl) +list(APPEND armnnLibraries armnnClBackend) + if(ARMCOMPUTECL) - add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl) - list(APPEND armnnLibraries armnnClBackend armnnClBackendWorkloads) + list(APPEND armnnLibraries armnnClBackendWorkloads) list(APPEND armnnUnitTestLibraries armnnClBackendUnitTests) else() message("CL backend is disabled") - add_subdirectory(${PROJECT_SOURCE_DIR}/src/backends/cl) - list(APPEND armnnLibraries armnnClBackend) endif() diff --git a/src/backends/cl/test/ClMemCopyTests.cpp b/src/backends/cl/test/ClMemCopyTests.cpp index af8a36d6c0..2635495e46 100644 --- a/src/backends/cl/test/ClMemCopyTests.cpp +++ b/src/backends/cl/test/ClMemCopyTests.cpp @@ -5,8 +5,7 @@ #include <backends/cl/ClWorkloadFactory.hpp> #include <backends/reference/RefWorkloadFactory.hpp> - -#include <backends/test/MemCopyTestImpl.hpp> +#include <backends/aclCommon/test/MemCopyTestImpl.hpp> #include <boost/test/unit_test.hpp> |