Revert "SWDEV-444098 - remove rocm-ocl-icd packaging"

This reverts commit 5f68a4531a.

Reason for revert: due to windows staging branch using Opencl-icd-loader master

Change-Id: I9cca7564a21de1733665a34da6f0322aa3b886e7

opencl/tests/ocltst/env/CMakeLists.txt

@@ -34,11 +34,10 @@ target_include_directories(ocltst
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(ocltst PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS})
-
-if(NOT WIN32)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-endif()
+target_link_libraries(ocltst
+    PRIVATE
+        OpenCL
+        )
 
 set_target_properties(ocltst PROPERTIES INSTALL_RPATH "$ORIGIN")
 

opencl/tests/ocltst/module/gl/CMakeLists.txt

@@ -45,7 +45,9 @@ target_include_directories(oclgl
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(oclgl PRIVATE
+target_link_libraries(oclgl
+    PRIVATE
+        OpenCL
         ${GLEW_LIBRARIES}
         ${OPENGL_LIBRARIES})
 

opencl/tests/ocltst/module/perf/CMakeLists.txt

@@ -95,10 +95,9 @@ target_include_directories(oclperf
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(oclperf PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS})
-if(NOT WIN32)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-endif()
+target_link_libraries(oclperf
+    PRIVATE
+        OpenCL)
 
 add_custom_command(
     TARGET oclperf POST_BUILD

opencl/tests/ocltst/module/runtime/CMakeLists.txt

@@ -68,10 +68,9 @@ target_include_directories(oclruntime
     PRIVATE
         $<TARGET_PROPERTY:Common,INTERFACE_INCLUDE_DIRECTORIES>)
 
-target_link_libraries(oclruntime PRIVATE OpenCL::OpenCL ${CMAKE_DL_LIBS})
-if(NOT WIN32)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pthread")
-endif()
+target_link_libraries(oclruntime
+    PRIVATE
+        OpenCL)
 
 add_custom_command(
     TARGET oclruntime POST_BUILD