From 6f86b69989de2469c0d7cac4c685cd081e6cf812 Mon Sep 17 00:00:00 2001
From: Sadik Armagan <sadik.armagan@arm.com>
Date: Mon, 9 Mar 2020 11:04:32 +0000
Subject: IVGCVSW-4540 Fix master build failure to link UnitTests on Android

Change-Id: I22148a0bf243eabfd045475644510f30096d96e3
Signed-off-by: Jim Flynn <jim.flynn@arm.com>
Signed-off-by: Sadik Armagan <sadik.armagan@arm.com>
---
 src/timelineDecoder/CMakeLists.txt | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

(limited to 'src')

diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt
index 6b8517acbc..e34fae71fa 100644
--- a/src/timelineDecoder/CMakeLists.txt
+++ b/src/timelineDecoder/CMakeLists.txt
@@ -3,19 +3,27 @@
 # SPDX-License-Identifier: MIT
 #
 
-set(timelineDecoder_sources)
-list(APPEND timelineDecoder_sources
-        ../../include/armnn/profiling/ITimelineDecoder.hpp
-        TimelineCaptureCommandHandler.cpp
-        TimelineCaptureCommandHandler.hpp
-        TimelineDecoder.cpp
-        TimelineDecoder.hpp
-        TimelineDirectoryCaptureCommandHandler.cpp
-        TimelineDirectoryCaptureCommandHandler.hpp
-        )
+if(BUILD_TIMELINE_DECODER)
+    set(timelineDecoder_sources)
+    list(APPEND timelineDecoder_sources
+            ../../include/armnn/profiling/ITimelineDecoder.hpp
+            TimelineCaptureCommandHandler.cpp
+            TimelineCaptureCommandHandler.hpp
+            TimelineDecoder.cpp
+            TimelineDecoder.hpp
+            TimelineDirectoryCaptureCommandHandler.cpp
+            TimelineDirectoryCaptureCommandHandler.hpp
+            )
 
-include_directories(../timelineDecoder ../profiling)
+    include_directories(../timelineDecoder ../profiling)
+
+    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} )
+
+    install(TARGETS timelineDecoder
+            LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
+            RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
+endif()
 
-add_library_ex(timelineDecoder SHARED ${timelineDecoder_sources})
 
-set_target_properties(timelineDecoder PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
\ No newline at end of file
-- 
cgit v1.2.1