From 9f0b428aa4b39cc4463f4c62f0fb5161814e0fb6 Mon Sep 17 00:00:00 2001 From: Aakash Sudhanwa Date: Wed, 6 May 2020 07:01:58 -0700 Subject: [PATCH] rocclr/CMakeLists.txt: Fixing unresolved merge conflict Change-Id: I09b9a955b0f1ece8d278112a22bc8aef31b57258 Signed-off-by: Aakash Sudhanwa [ROCm/hip commit: 6f86a740185e3b280b4a7e5e83f3ad7b94371f47] --- projects/hip/rocclr/CMakeLists.txt | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/projects/hip/rocclr/CMakeLists.txt b/projects/hip/rocclr/CMakeLists.txt index ef30ddb8aa..5158b7935e 100644 --- a/projects/hip/rocclr/CMakeLists.txt +++ b/projects/hip/rocclr/CMakeLists.txt @@ -195,17 +195,11 @@ target_link_libraries(device INTERFACE host) # TODO: we may create host_static and device_static to let app # link amdhip64_static -<<<<<<< HEAD:vdi/CMakeLists.txt # FIXME: Linux convention is to create static library with same base # filename. -target_link_libraries(amdhip64 PRIVATE amdvdi_static Threads::Threads dl) +target_link_libraries(amdhip64 PRIVATE amdrocclr_static Threads::Threads dl) target_link_libraries(amdhip64_static PRIVATE Threads::Threads dl) target_link_libraries(amdhip64_static_temp PRIVATE Threads::Threads dl) -======= -target_link_libraries(amdhip64 PRIVATE amdrocclr_static pthread dl) -target_link_libraries(amdhip64_static PRIVATE pthread dl) -target_link_libraries(amdhip64_static_temp PRIVATE pthread dl) ->>>>>>> bf7c645f... name change vdi to rocclr:rocclr/CMakeLists.txt # combine objects of vid and hip into amdhip64_static add_custom_target(