IVGCVSW-3400 Fixed include directives for Gatord builds

 * Using proper include directives with include paths
 * The relative paths used were causing trouble when building
   on other CI systems

Signed-off-by: Matteo Martincigh <matteo.martincigh@arm.com>
Change-Id: I897a80d1f56fbdbc3c714a50a0598210d8f0a03c

6 files changed, 22 insertions, 20 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6bc6573a96..499f721eb5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -905,7 +905,7 @@ if(BUILD_GATORD_MOCK)
         tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp
         )
 
-    include_directories( ${Boost_INCLUDE_DIRS} src/profiling)
+    include_directories(${Boost_INCLUDE_DIRS} src/profiling)
 
     add_library_ex(gatordMockService STATIC ${gatord_mock_sources})
 
@@ -915,9 +915,10 @@ if(BUILD_GATORD_MOCK)
         target_link_libraries(GartordMock pthread)
     endif()
 
-    target_link_libraries(GartordMock armnn gatordMockService)
     target_link_libraries(GartordMock
-        ${Boost_PROGRAM_OPTIONS_LIBRARY} ${Boost_SYSTEM_LIBRARY}
-        )
+        armnn
+        gatordMockService
+        ${Boost_PROGRAM_OPTIONS_LIBRARY}
+        ${Boost_SYSTEM_LIBRARY})
 
 endif()
diff --git a/tests/profiling/gatordmock/GatordMockService.cpp b/tests/profiling/gatordmock/GatordMockService.cpp
index f4146c2e38..b5531c4e08 100644
--- a/tests/profiling/gatordmock/GatordMockService.cpp
+++ b/tests/profiling/gatordmock/GatordMockService.cpp
@@ -2,9 +2,10 @@
 // Copyright © 2019 Arm Ltd. All rights reserved.
 // SPDX-License-Identifier: MIT
 //
+
 #include "GatordMockService.hpp"
 
-#include "../../src/profiling/CommandHandlerRegistry.hpp"
+#include <CommandHandlerRegistry.hpp>
 
 #include <cerrno>
 #include <fcntl.h>
@@ -16,7 +17,6 @@
 #include <sys/un.h>
 #include <unistd.h>
 
-
 namespace armnn
 {
 
diff --git a/tests/profiling/gatordmock/GatordMockService.hpp b/tests/profiling/gatordmock/GatordMockService.hpp
index 1aba2e8a09..c860f16815 100644
--- a/tests/profiling/gatordmock/GatordMockService.hpp
+++ b/tests/profiling/gatordmock/GatordMockService.hpp
@@ -5,13 +5,13 @@
 
 #pragma once
 
+#include <CommandHandlerRegistry.hpp>
+#include <Packet.hpp>
+
 #include <string>
 #include <thread>
 #include <atomic>
 
-#include "../../src/profiling/CommandHandlerRegistry.hpp"
-#include "../../src/profiling/Packet.hpp"
-
 namespace armnn
 {
 
diff --git a/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.cpp b/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.cpp
index 5a70f68805..f3bf7960ea 100644
--- a/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.cpp
+++ b/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.cpp
@@ -3,13 +3,14 @@
 // SPDX-License-Identifier: MIT
 //
 
-#include <iostream>
-
-#include "../../../src/profiling/ProfilingUtils.hpp"
 #include "PeriodicCounterCaptureCommandHandler.hpp"
 
+#include <ProfilingUtils.hpp>
+
 #include <boost/numeric/conversion/cast.hpp>
 
+#include <iostream>
+
 namespace armnn
 {
 
@@ -144,4 +145,4 @@ void PeriodicCounterCaptureCommandHandler::operator()(const profiling::Packet& p
 
 }    // namespace gatordmock
 
-}    // namespace armnn
\ No newline at end of file
+}    // namespace armnn
diff --git a/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp b/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp
index 7f46d8e102..7d6471bf91 100644
--- a/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp
+++ b/tests/profiling/gatordmock/PeriodicCounterCaptureCommandHandler.hpp
@@ -5,8 +5,8 @@
 
 #pragma once
 
-#include "../../armnn/src/profiling/Packet.hpp"
-#include "../../armnn/src/profiling/CommandHandlerFunctor.hpp"
+#include <Packet.hpp>
+#include <CommandHandlerFunctor.hpp>
 
 #include <vector>
 
@@ -51,4 +51,4 @@ private:
 
 } // namespace gatordmock
 
-} // namespace armnn
\ No newline at end of file
+} // namespace armnn
diff --git a/tests/profiling/gatordmock/tests/GatordMockTests.cpp b/tests/profiling/gatordmock/tests/GatordMockTests.cpp
index 66778cd087..a6297e94b8 100644
--- a/tests/profiling/gatordmock/tests/GatordMockTests.cpp
+++ b/tests/profiling/gatordmock/tests/GatordMockTests.cpp
@@ -3,14 +3,14 @@
 // SPDX-License-Identifier: MIT
 //
 
+#include "../GatordMockService.hpp"
 #include "../MockUtils.hpp"
 #include "../PeriodicCounterCaptureCommandHandler.hpp"
 
-#include "../../src/profiling/CommandHandlerRegistry.hpp"
-#include "../GatordMockService.hpp"
+#include <CommandHandlerRegistry.hpp>
+#include <ProfilingService.hpp>
 
-#include "../../src/profiling/ProfilingService.hpp"
-#include "../../src/profiling/test/SendCounterPacketTests.hpp"
+#include <test/SendCounterPacketTests.hpp>
 
 #include <boost/cast.hpp>
 #include <boost/test/test_tools.hpp>