5 files changed, 20 insertions, 14 deletions
diff --git a/src/backends/neon/CMakeLists.txt b/src/backends/neon/CMakeLists.txt
index 0f7759d7e2..badad2f8a4 100644
--- a/src/backends/neon/CMakeLists.txt
+++ b/src/backends/neon/CMakeLists.txt
@@ -3,20 +3,17 @@
 # SPDX-License-Identifier: MIT
 #
 
-list(APPEND armnnNeonBackend_sources
-    NeonBackendId.hpp
-    NeonLayerSupport.cpp
-    NeonLayerSupport.hpp
-    NeonWorkloadFactory.cpp
-    NeonWorkloadFactory.hpp
-)
-
 if(ARMCOMPUTENEON)
     list(APPEND armnnNeonBackend_sources
         NeonBackend.cpp
         NeonBackend.hpp
+        NeonBackendId.hpp
         NeonInterceptorScheduler.hpp
         NeonInterceptorScheduler.cpp
+        NeonLayerSupport.cpp
+        NeonLayerSupport.hpp
+        NeonWorkloadFactory.cpp
+        NeonWorkloadFactory.hpp
         NeonTensorHandle.hpp
         NeonTimer.hpp
         NeonTimer.cpp
@@ -27,10 +24,18 @@ if(ARMCOMPUTENEON)
     if(BUILD_UNIT_TESTS)
         add_subdirectory(test)
     endif()
+
+else()
+    list(APPEND armnnNeonBackend_sources
+        NeonBackendId.hpp
+        NeonLayerSupport.cpp
+        NeonLayerSupport.hpp
+        NeonWorkloadFactory.cpp
+        NeonWorkloadFactory.hpp
+    )
 endif()
 
 add_library(armnnNeonBackend OBJECT ${armnnNeonBackend_sources})
 target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnn)
 target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/armnnUtils)
 target_include_directories(armnnNeonBackend PRIVATE ${PROJECT_SOURCE_DIR}/src/backends)
-
diff --git a/src/backends/neon/NeonBackend.cpp b/src/backends/neon/NeonBackend.cpp
index 1e9f633a21..7058d24e72 100644
--- a/src/backends/neon/NeonBackend.cpp
+++ b/src/backends/neon/NeonBackend.cpp
@@ -9,6 +9,8 @@
 
 #include <backendsCommon/BackendRegistry.hpp>
 
+#include <boost/cast.hpp>
+
 namespace armnn
 {
 
@@ -19,7 +21,7 @@ static StaticRegistryInitializer<BackendRegistry> g_RegisterHelper
 {
     BackendRegistryInstance(),
     NeonBackend::GetIdStatic(),
-    [](const EmptyInitializer&)
+    []()
     {
         return IBackendInternalUniquePtr(new NeonBackend);
     }
diff --git a/src/backends/neon/NeonBackend.hpp b/src/backends/neon/NeonBackend.hpp
index 27ad94db34..b8bbd781a4 100644
--- a/src/backends/neon/NeonBackend.hpp
+++ b/src/backends/neon/NeonBackend.hpp
@@ -12,8 +12,8 @@ namespace armnn
 class NeonBackend : public IBackendInternal
 {
 public:
-    NeonBackend() = default;
-    ~NeonBackend() override = default;
+    NeonBackend()  = default;
+    ~NeonBackend() = default;
 
     static const BackendId& GetIdStatic();
     const BackendId& GetId() const override { return GetIdStatic(); }
diff --git a/src/backends/neon/NeonLayerSupport.cpp b/src/backends/neon/NeonLayerSupport.cpp
index 4704135540..a4a6b67c0b 100644
--- a/src/backends/neon/NeonLayerSupport.cpp
+++ b/src/backends/neon/NeonLayerSupport.cpp
@@ -49,7 +49,7 @@ ILayerSupportSharedPtr GetLayerSupportPointer()
 static StaticRegistryInitializer<LayerSupportRegistry> g_RegisterHelper{
     LayerSupportRegistryInstance(),
     NeonBackendId(),
-    [](const EmptyInitializer&)
+    []()
     {
         return GetLayerSupportPointer();
     }
diff --git a/src/backends/neon/backend.mk b/src/backends/neon/backend.mk
index 29b3527542..8f7e72b17c 100644
--- a/src/backends/neon/backend.mk
+++ b/src/backends/neon/backend.mk
@@ -49,4 +49,3 @@ BACKEND_TEST_SOURCES := \
         test/NeonOptimizedNetworkTests.cpp \
         test/NeonRuntimeTests.cpp \
         test/NeonTimerTest.cpp
-