From d1cfad624e04090a23809a726c8f7160b3baa63f Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Thu, 11 Jun 2020 12:43:57 -0500 Subject: [PATCH 1/4] Use the correct library name for rocclr --- vdi/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdi/CMakeLists.txt b/vdi/CMakeLists.txt index 8c1ca1f2de..7ecb72e53a 100644 --- a/vdi/CMakeLists.txt +++ b/vdi/CMakeLists.txt @@ -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 ) From 81ebaea516f930a96cda2e47ab4ddea56206a1fe Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Thu, 11 Jun 2020 13:04:47 -0500 Subject: [PATCH 2/4] Update cmake file name --- vdi/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdi/CMakeLists.txt b/vdi/CMakeLists.txt index 7ecb72e53a..9aa7e0afbb 100644 --- a/vdi/CMakeLists.txt +++ b/vdi/CMakeLists.txt @@ -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_static.cmake) add_library(amdhip64 SHARED $ From f0c06745b69a1f7cb482d5edae9ba27b4b6426f3 Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Thu, 11 Jun 2020 13:06:06 -0500 Subject: [PATCH 3/4] Fix name of imported target --- vdi/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vdi/CMakeLists.txt b/vdi/CMakeLists.txt index 9aa7e0afbb..28ff771222 100644 --- a/vdi/CMakeLists.txt +++ b/vdi/CMakeLists.txt @@ -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 $ DESTINATION lib COMPONENT MAIN) From 517ddd907df11325ef90cafe6d645860b251ec71 Mon Sep 17 00:00:00 2001 From: Paul Fultz II Date: Thu, 11 Jun 2020 13:07:56 -0500 Subject: [PATCH 4/4] Spell cmake file name correctly --- vdi/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vdi/CMakeLists.txt b/vdi/CMakeLists.txt index 28ff771222..fcf9281e41 100644 --- a/vdi/CMakeLists.txt +++ b/vdi/CMakeLists.txt @@ -146,7 +146,7 @@ set_target_properties( set(THREADS_PREFER_PTHREAD_FLAG ON) find_package(Threads REQUIRED) -include(${LIBVDI_STATIC_DIR}/amdrocclr_static.cmake) +include(${LIBVDI_STATIC_DIR}/amdrocclr_staticTargets.cmake) add_library(amdhip64 SHARED $