SWDEV-306262 - Fix RUNPATH

RUNPATH was not changed to correct ROCM_RPATH
Packaged proper binaries after RUNPATH correction

Signed-off-by: Ashutosh Mishra <Ashutosh.Mishra@amd.com>

Change-Id: I97443cc0d6cb1ecf7352e3c83ae0fe38a8f339bf

opencl/CMakeLists.txt

@@ -12,6 +12,7 @@ include(GNUInstallDirs)
 option(BUILD_TESTS "Enable building OpenCL tests" OFF)
 option(EMU_ENV "Enable building for emulation environment" OFF)
 
+
 set(OPENCL_ICD_LOADER_HEADERS_DIR "${CMAKE_CURRENT_LIST_DIR}/khronos/headers/opencl2.2" CACHE PATH "")
 add_subdirectory(khronos/icd)
 add_subdirectory(amdocl)
@@ -68,35 +69,14 @@ endif()
 message (STATUS "ROCM Installation path(ROCM_PATH): ${ROCM_PATH}")
 
 
-#Package: rocm-opencl,rocm-opencl-dev/devel
-add_subdirectory(packaging)
+#Package: rocm-opencl,rocm-opencl-dev/devel,rocm-ocl-icd
 
-
-#Package: rocm-ocl-icd
 set(BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/packages/rocm-ocl-icd)
-#configure_file(packaging/rocm-ocl-icd.txt ${BUILD_DIR}/CMakeLists.txt @ONLY)
 configure_file(packaging/rocm-ocl-icd.postinst ${BUILD_DIR}/postinst @ONLY)
 configure_file(packaging/rocm-ocl-icd.prerm ${BUILD_DIR}/prerm @ONLY)
 configure_file(packaging/rocm-ocl-icd.rpm_post ${BUILD_DIR}/rpm_post @ONLY)
 configure_file(packaging/rocm-ocl-icd.rpm_postun ${BUILD_DIR}/rpm_postun @ONLY)
-#add_custom_target(pkg_rocm_ocl_icd COMMAND ${CMAKE_COMMAND} -DROCM_DEP_ROCMCORE=${ROCM_DEP_ROCMCORE} .
-#  COMMAND rm -rf *.deb *.rpm *.tar.gz
-#  COMMAND make package
-#  COMMAND cp *.deb ${PROJECT_BINARY_DIR}
-#  COMMAND cp *.rpm ${PROJECT_BINARY_DIR}
-#  WORKING_DIRECTORY ${BUILD_DIR}
-#  DEPENDS amdocl OpenCL)
 
-#Package: all
-#if(POLICY CMP0037)
-#  cmake_policy(PUSH)
-#  cmake_policy(SET CMP0037 OLD)
-#endif()
+add_subdirectory(packaging)
 
-#add_custom_target(package_icd
-#  WORKING_DIRECTORY ${PROJECT_BINARY_DIR}
-#  DEPENDS pkg_rocm_ocl_icd )
-##if(POLICY CMP0037)
-#  cmake_policy(POP)
-#endif()
 endif()

opencl/packaging/CMakeLists.txt

@@ -5,11 +5,8 @@ set(CPACK_COMPONENTS_ALL binary dev icd)
 set(CPACK_DEB_COMPONENT_INSTALL ON)
 set(CPACK_RPM_COMPONENT_INSTALL ON)
 
-
-
-
-install(PROGRAMS ${CMAKE_BINARY_DIR}/tools/clinfo/clinfo DESTINATION bin COMPONENT binary)
-install(FILES ${CMAKE_BINARY_DIR}/amdocl/libamdocl64.so DESTINATION lib COMPONENT binary)
+install(TARGETS clinfo DESTINATION bin COMPONENT binary)
+install(TARGETS amdocl DESTINATION lib COMPONENT binary)
 install(FILES ${CMAKE_SOURCE_DIR}/LICENSE.txt DESTINATION share/doc/${CMAKE_PROJECT_NAME} COMPONENT binary)
 
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2/CL
@@ -20,9 +17,7 @@ install(DIRECTORY ${CMAKE_SOURCE_DIR}/khronos/headers/opencl2.2/CL
         PATTERN cl_dx9_media_sharing.h EXCLUDE
         PATTERN cl_egl.h EXCLUDE )
 
-install(FILES ${CMAKE_BINARY_DIR}/khronos/icd/libOpenCL.so DESTINATION lib COMPONENT icd )
-install(FILES ${CMAKE_BINARY_DIR}/khronos/icd/libOpenCL.so.${OPENCL_LIB_VERSION_MAJOR}  DESTINATION lib COMPONENT icd )
-install(FILES ${CMAKE_BINARY_DIR}/khronos/icd/libOpenCL.so.${OPENCL_LIB_VERSION_STRING} DESTINATION lib COMPONENT icd )
+install(TARGETS OpenCL DESTINATION lib COMPONENT icd )
 install(FILES ${CMAKE_SOURCE_DIR}/khronos/icd/LICENSE DESTINATION share/doc/rocm-ocl-icd COMPONENT icd)