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: 1cc934204f]
Этот коммит содержится в:
Freddy Paul
2021-05-26 08:57:06 -07:00
коммит произвёл Freddy Paul
родитель 99ae6ad86a
Коммит 1c6c8def17
2 изменённых файлов: 2 добавлений и 2 удалений
+1 -2
Просмотреть файл
@@ -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" )
+1
Просмотреть файл
@@ -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