commit ef2838bbf3b64e045538e94493acc596da184143
author Jim Flynn <jim.flynn@arm.com> Thu Jul 30 11:47:02 2020 +0100
committer Jim Flynn <jim.flynn@arm.com> Thu Jul 30 11:47:02 2020 +0100
tree 2af3a57d9fd1adcb06830f06b1774bfc594c354d
parent 49895f4738e1969080b47b837a152cd6b5c8414c

IVGCVSW-5171 Change library name to allow adbPush

Change-Id: Ifc79b433dfcc034822cfb538102b936987e382c8
Signed-off-by: Jim Flynn <jim.flynn@arm.com>

CMakeLists.txt

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1c7258f..8a1898e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -956,7 +956,7 @@
 
     if(BUILD_TIMELINE_DECODER)
         target_link_libraries(UnitTests timelineDecoder)
-        target_link_libraries(UnitTests jsonTimelineDecoder)
+        target_link_libraries(UnitTests timelineDecoderJson)
     endif()
 
     if(BUILD_TF_LITE_PARSER)

src/timelineDecoder/CMakeLists.txt

diff --git a/src/timelineDecoder/CMakeLists.txt b/src/timelineDecoder/CMakeLists.txt
index e7d5481..af5adda 100644
--- a/src/timelineDecoder/CMakeLists.txt
+++ b/src/timelineDecoder/CMakeLists.txt
@@ -4,8 +4,8 @@
 #
 
 if(BUILD_TIMELINE_DECODER)
-    set(jsonTimelineDecoder_sources)
-    list(APPEND jsonTimelineDecoder_sources
+    set(timelineDecoderJson_sources)
+    list(APPEND timelineDecoderJson_sources
         JSONTimelineDecoder.cpp
         JSONTimelineDecoder.hpp)
 
@@ -18,16 +18,14 @@
       target_include_directories(UnitTests PRIVATE ${PROJECT_SOURCE_DIR}/src/timelineDecoder)
     endif()
 
-    add_library_ex(jsonTimelineDecoder SHARED ${jsonTimelineDecoder_sources})
+    add_library_ex(timelineDecoderJson SHARED ${timelineDecoderJson_sources})
 
-    set_target_properties(jsonTimelineDecoder PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
-    set_target_properties(jsonTimelineDecoder PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+    set_target_properties(timelineDecoderJson PROPERTIES LIBRARY_OUTPUT_DIRECTORY ${PROJECT_BINARY_DIR})
+    set_target_properties(timelineDecoderJson PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
 
-    target_link_libraries(jsonTimelineDecoder armnn)
+    target_link_libraries(timelineDecoderJson armnn)
 
-    install(TARGETS jsonTimelineDecoder
+    install(TARGETS timelineDecoderJson
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR})
 endif()
-
-