Skip to content

Use the correct library name for rocclr #2103

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed

Use the correct library name for rocclr #2103

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d1cfad6
Use the correct library name for rocclr
pfultz2 Jun 11, 2020
81ebaea
Update cmake file name
pfultz2 Jun 11, 2020
f0c0674
Fix name of imported target
pfultz2 Jun 11, 2020
517ddd9
Spell cmake file name correctly
pfultz2 Jun 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions vdi/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ set(USE_PROF_API "1")

if(NOT DEFINED LIBVDI_STATIC_DIR)
find_path(LIBVDI_STATIC_DIR
NAMES libamdvdi_static.a
NAMES libamdrocclr_static.a
PATHS /opt/rocm/vdi
PATH_SUFFIXES lib
)
Expand Down Expand Up @@ -146,7 +146,7 @@ set_target_properties(

set(THREADS_PREFER_PTHREAD_FLAG ON)
find_package(Threads REQUIRED)
include(${LIBVDI_STATIC_DIR}/amdvdi_staticTargets.cmake)
include(${LIBVDI_STATIC_DIR}/amdrocclr_staticTargets.cmake)

add_library(amdhip64 SHARED
$<TARGET_OBJECTS:hip64>
Expand All @@ -161,8 +161,8 @@ target_link_libraries(host INTERFACE amdhip64)
add_library(device INTERFACE)
target_link_libraries(device INTERFACE host)

target_link_libraries(amdhip64_static PRIVATE amdvdi_static pthread dl)
target_link_libraries(amdhip64 PRIVATE amdvdi_static pthread dl)
target_link_libraries(amdhip64_static PRIVATE amdrocclr_static pthread dl)
target_link_libraries(amdhip64 PRIVATE amdrocclr_static pthread dl)


INSTALL(PROGRAMS $<TARGET_FILE:amdhip64_static> DESTINATION lib COMPONENT MAIN)
Expand Down