From 16dc9f3f93b9da66e2af88ece3c8e08cb6ff64b6 Mon Sep 17 00:00:00 2001 From: Sean Keely Date: Wed, 17 Jun 2020 19:30:50 -0500 Subject: [PATCH] Enforce uniform library names. Static and dynamic builds should both output libhsa-runtime64.?? Current code produces libhsa-runtime64_static.a. Change-Id: Ibf1983f560cd069b33d98fec432e3174a17d8d6c [ROCm/ROCR-Runtime commit: 2042ed3bdb97182cfe6099ab9ca56a83da6ed86e] --- projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt index 563cc1cf8d..a93477321c 100644 --- a/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt +++ b/projects/rocr-runtime/runtime/hsa-runtime/CMakeLists.txt @@ -111,6 +111,9 @@ find_package(hsakmt 1.0 REQUIRED HINTS ${CMAKE_INSTALL_PREFIX} PATHS /opt/rocm) ## Create the rocr target. add_library( ${CORE_RUNTIME_TARGET} "" ) +## Enforce uniform output file naming. +set_property(TARGET ${CORE_RUNTIME_TARGET} PROPERTY OUTPUT_NAME ${CORE_RUNTIME_NAME} ) + ## Compiler preproc definitions. target_compile_definitions(${CORE_RUNTIME_TARGET} PRIVATE "${HSA_COMMON_DEFS}" __linux__ HSA_EXPORT=1 HSA_EXPORT_FINALIZER=1 HSA_EXPORT_IMAGES=1 HSA_DEPRECATED= ROCR_BUILD_ID=${PACKAGE_VERSION_STRING} )