Revert "IVGCVSW-2056 + IVGCVSW-2064 : move ClContextControl to the ClBackend"

This reverts commit d4dfa684941a21314b70593d01b0fc2167eebad4.

Change-Id: Id61ce69215505c3cf5d30ec2a7ec9127fb2554fc

1 files changed, 16 insertions, 11 deletions

diff --git a/src/backends/cl/CMakeLists.txt b/src/backends/cl/CMakeLists.txt
index 30254582b2..d751854c92 100644
--- a/src/backends/cl/CMakeLists.txt
+++ b/src/backends/cl/CMakeLists.txt
@@ -3,23 +3,18 @@
 # SPDX-License-Identifier: MIT
 #
 
-list(APPEND armnnClBackend_sources
-    ClBackendId.hpp
-    ClLayerSupport.cpp
-    ClLayerSupport.hpp
-    ClWorkloadFactory.cpp
-    ClWorkloadFactory.hpp
-)
-
 if(ARMCOMPUTECL)
     list(APPEND armnnClBackend_sources
-        ClBackendContext.cpp
-        ClBackendContext.hpp
         ClBackend.cpp
         ClBackend.hpp
+        ClBackendId.hpp
         ClContextControl.cpp
         ClContextControl.hpp
+        ClLayerSupport.cpp
+        ClLayerSupport.hpp
         ClTensorHandle.hpp
+        ClWorkloadFactory.cpp
+        ClWorkloadFactory.hpp
         OpenClTimer.cpp
         OpenClTimer.hpp
     )
@@ -29,10 +24,20 @@ if(ARMCOMPUTECL)
     if(BUILD_UNIT_TESTS)
         add_subdirectory(test)
     endif()
+
+else()
+    list(APPEND armnnClBackend_sources
+        ClBackendId.hpp
+        ClContextControl.cpp
+        ClContextControl.hpp
+        ClLayerSupport.cpp
+        ClLayerSupport.hpp
+        ClWorkloadFactory.cpp
+        ClWorkloadFactory.hpp
+    )
 endif()
 
 add_library(armnnClBackend OBJECT ${armnnClBackend_sources})
 target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
 target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
 target_include_directories(armnnClBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
-