From 1c6c8def17ccbd4165d5421ffc6ff490033a9321 Mon Sep 17 00:00:00 2001
From: Freddy Paul <Freddy.paul@amd.com>
Date: Wed, 26 May 2021 08:57:06 -0700
Subject: [PATCH] roctracer:All libraries need to be installed with LIBRARY TAG

Cmake will do the post processing required for RPATH or any other
needed for the libraries only if installed as libraries not as
regular files

FIX: SWDEV-287893
Change-Id: I9cf478fcd23b9f2e8b3bdd81aa566cad3ec2a5e3


[ROCm/roctracer commit: 1cc934204f1169a8a2401ac3f1574ee3750ff5f2]
---
 projects/roctracer/CMakeLists.txt      | 3 +--
 projects/roctracer/test/CMakeLists.txt | 1 +
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/projects/roctracer/CMakeLists.txt b/projects/roctracer/CMakeLists.txt
index 1d688e0a41..f8bff20c64 100644
--- a/projects/roctracer/CMakeLists.txt
+++ b/projects/roctracer/CMakeLists.txt
@@ -71,6 +71,7 @@ set ( TARGET_NAME "${ROCTRACER_TARGET}" )
 set ( ROOT_DIR "${CMAKE_CURRENT_SOURCE_DIR}" )
 set ( LIB_DIR "${ROOT_DIR}/src" )
 set ( TEST_DIR "${ROOT_DIR}/test" )
+set ( DEST_NAME ${ROCTRACER_NAME} )
 
 ## Build library
 include ( ${LIB_DIR}/CMakeLists.txt )
@@ -114,7 +115,6 @@ set ( GEN_HEADERS
 if ( ${LIBRARY_TYPE} STREQUAL SHARED )
 
 ## Installation and packaging
-set ( DEST_NAME ${ROCTRACER_NAME} )
 if ( DEFINED CPACK_PACKAGING_INSTALL_PREFIX )
   get_filename_component ( DEST_NAME ${CPACK_PACKAGING_INSTALL_PREFIX} NAME )
   get_filename_component ( DEST_DIR ${CPACK_PACKAGING_INSTALL_PREFIX} DIRECTORY )
@@ -149,7 +149,6 @@ endforeach ()
 install ( FILES ${PROJECT_BINARY_DIR}/so-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so )
 install ( FILES ${PROJECT_BINARY_DIR}/so-major-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so.${LIB_VERSION_MAJOR} )
 install ( FILES ${PROJECT_BINARY_DIR}/so-patch-link DESTINATION lib RENAME ${ROCTRACER_LIBRARY}.so.${LIB_VERSION_STRING} )
-install ( FILES ${PROJECT_BINARY_DIR}/test/libtracer_tool.so DESTINATION ${DEST_NAME}/tool )
 
 ## rocTX
 set ( ROCTX_TARGET "roctx64" )
diff --git a/projects/roctracer/test/CMakeLists.txt b/projects/roctracer/test/CMakeLists.txt
index c2d6d1f44e..99fd335a27 100644
--- a/projects/roctracer/test/CMakeLists.txt
+++ b/projects/roctracer/test/CMakeLists.txt
@@ -87,6 +87,7 @@ if ( DEFINED ROCTRACER_TARGET )
   add_library ( ${TEST_LIB} SHARED ${TEST_LIB_SRC} )
   target_include_directories ( ${TEST_LIB} PRIVATE ${HSA_TEST_DIR} ${ROOT_DIR} ${ROOT_DIR}/inc ${HSA_RUNTIME_INC_PATH} ${HIP_INC_DIR} ${HSA_KMT_INC_PATH} ${GEN_INC_DIR} )
   target_link_libraries ( ${TEST_LIB} ${ROCTRACER_TARGET} ${HSA_RUNTIME_LIB} c stdc++ dl pthread rt numa )
+  install ( TARGETS ${TEST_LIB} LIBRARY DESTINATION ${DEST_NAME}/tool )
 endif ()
 
 ## Build hsaco_test.cpp referenc test