From 43f722590c76c6d38d7c4197f42ebde264fb0495 Mon Sep 17 00:00:00 2001
From: Vladislav Sytchenko <Vladislav.Sytchenko@amd.com>
Date: Mon, 7 Jun 2021 14:25:28 -0400
Subject: [PATCH] SWDEV-273235 - ocltst build fixes

Correctly reference the new amdocl target.

Do not use hardcoded paths to libamdocl64.so, instead query the path to
it from cmake.

Change-Id: I4738dd8d6d08f9fb72fdd725b6488b81342755a4


[ROCm/clr commit: 6046e6fea4d09821ac4aad611ed24f63973ae279]
---
 projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt | 8 ++++----
 .../clr/opencl/tests/ocltst/module/perf/CMakeLists.txt    | 8 ++++----
 .../clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt | 8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
index 240f5fe31a..4ec3d5061e 100644
--- a/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/gl/CMakeLists.txt
@@ -48,10 +48,10 @@ add_custom_command(
 
 add_custom_target(test.ocltst.oclgl
     COMMAND
-        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
         $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclgl> -A oclgl.exclude
     DEPENDS
-        ocltst oclgl amdocl64
+        ocltst oclgl amdocl
     WORKING_DIRECTORY
         ${CMAKE_BINARY_DIR}/tests/ocltst
     USES_TERMINAL)
@@ -59,10 +59,10 @@ add_custom_target(test.ocltst.oclgl
 foreach(TEST ${TESTS})
     add_custom_target(test.ocltst.oclgl.${TEST}
         COMMAND
-            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
             $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclgl> -t ${TEST}
         DEPENDS
-            ocltst oclgl amdocl64
+            ocltst oclgl amdocl
         WORKING_DIRECTORY
             ${CMAKE_BINARY_DIR}/tests/ocltst
         USES_TERMINAL)
diff --git a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
index b1a01d9218..c7434ee0c0 100644
--- a/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/perf/CMakeLists.txt
@@ -120,10 +120,10 @@ add_custom_command(
 
 add_custom_target(test.ocltst.oclperf
     COMMAND
-        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
         $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclperf> -A oclperf.exclude
     DEPENDS
-        ocltst oclperf amdocl64
+        ocltst oclperf amdocl
     WORKING_DIRECTORY
         ${CMAKE_BINARY_DIR}/tests/ocltst
     USES_TERMINAL)
@@ -131,10 +131,10 @@ add_custom_target(test.ocltst.oclperf
 foreach(TEST ${TESTS})
     add_custom_target(test.ocltst.oclperf.${TEST}
         COMMAND
-            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
             $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclperf> -t ${TEST}
         DEPENDS
-            ocltst oclperf amdocl64
+            ocltst oclperf amdocl
         WORKING_DIRECTORY
             ${CMAKE_BINARY_DIR}/tests/ocltst
         USES_TERMINAL)
diff --git a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
index 91d82d22c5..cdfe1a55a3 100644
--- a/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
+++ b/projects/clr/opencl/tests/ocltst/module/runtime/CMakeLists.txt
@@ -88,10 +88,10 @@ add_custom_command(
 
 add_custom_target(test.ocltst.oclruntime
     COMMAND
-        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+        ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
         $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclruntime> -A oclruntime.exclude
     DEPENDS
-        ocltst oclruntime amdocl64
+        ocltst oclruntime amdocl
     WORKING_DIRECTORY
         ${CMAKE_BINARY_DIR}/tests/ocltst
     USES_TERMINAL)
@@ -99,10 +99,10 @@ add_custom_target(test.ocltst.oclruntime
 foreach(TEST ${TESTS})
     add_custom_target(test.ocltst.oclruntime.${TEST}
         COMMAND
-            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=${CMAKE_BINARY_DIR}/lib:$ENV{LD_LIBRARY_PATH}"
+            ${CMAKE_COMMAND} -E env "LD_LIBRARY_PATH=$<TARGET_FILE_DIR:amdocl>:$ENV{LD_LIBRARY_PATH}"
             $<TARGET_FILE:ocltst> -m $<TARGET_FILE:oclruntime> -t ${TEST}
         DEPENDS
-            ocltst oclruntime amdocl64
+            ocltst oclruntime amdocl
         WORKING_DIRECTORY
             ${CMAKE_BINARY_DIR}/tests/ocltst
         USES_TERMINAL)