IVGCVSW-4731 Move Packet.hpp to profiling/common/include

 * Refactor profiling cmake to fix inconsistencies/issues with includes

Signed-off-by: Finn Williams <Finn.Williams@arm.com>
Change-Id: I0836762d4c72e25754a28162ec54c8e332422a02

1 files changed, 17 insertions, 12 deletions

diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt
index 12fe2a0f04..f844325b1d 100644
--- a/src/timelineDecoder/CMakeLists.txt
+++ b/src/timelineDecoder/CMakeLists.txt
@@ -6,20 +6,25 @@
 if(BUILD_TIMELINE_DECODER)
     set(timelineDecoder_sources)
     list(APPEND timelineDecoder_sources
-            ../../include/armnn/profiling/ITimelineDecoder.hpp
-            TimelineCaptureCommandHandler.cpp
-            TimelineCaptureCommandHandler.hpp
-            JSONTimelineDecoder.cpp
-            JSONTimelineDecoder.hpp
-            TimelineDecoder.cpp
-            TimelineDecoder.hpp
-            TimelineDirectoryCaptureCommandHandler.cpp
-            TimelineDirectoryCaptureCommandHandler.hpp
-            )
-
-    include_directories(../timelineDecoder ../profiling)
+        ${PROJECT_SOURCE_DIR}/include/armnn/profiling/ITimelineDecoder.hpp
+        TimelineCaptureCommandHandler.cpp
+        TimelineCaptureCommandHandler.hpp
+        JSONTimelineDecoder.cpp
+        JSONTimelineDecoder.hpp
+        TimelineDecoder.cpp
+        TimelineDecoder.hpp
+        TimelineDirectoryCaptureCommandHandler.cpp
+        TimelineDirectoryCaptureCommandHandler.hpp)
+
+    include_directories(${PROJECT_SOURCE_DIR}/src/profiling
+                        ${PROJECT_SOURCE_DIR}/profiling/common/include)
+
+    if(BUILD_UNIT_TESTS)
+      target_include_directories(UnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/timelineDecoder)
+    endif()
 
     add_library_ex(timelineDecoder SHARED ${timelineDecoder_sources})
+
     set_target_properties(timelineDecoder PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
     set_target_properties(timelineDecoder PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )