From 3d8180e5af633e2c711f3f5de9cbfe5cb3204ee3 Mon Sep 17 00:00:00 2001
From: Chris Freehill <Chris.Freehill@amd.com>
Date: Tue, 17 Mar 2020 18:06:56 -0500
Subject: [PATCH] Correct CMake install  for rdc_libs target

This will allow us to not have to use LD_LIBRARY_PATH when
packages are installed.

Change-Id: I16b4c50d400c3c7e3bbebe446c53d3605cebae53


[ROCm/rdc commit: 7084690872a3c627142e72d200b8eb9609288710]
---
 projects/rdc/CMakeLists.txt          | 3 ++-
 projects/rdc/rdc_libs/CMakeLists.txt | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/projects/rdc/CMakeLists.txt b/projects/rdc/CMakeLists.txt
index 37f667cb04..10e3e66c70 100755
--- a/projects/rdc/CMakeLists.txt
+++ b/projects/rdc/CMakeLists.txt
@@ -138,6 +138,7 @@ set(SERVER_BIN_COMPONENT "server_bin")
 set(CLIENT_LIB_COMPONENT "client_lib")
 set(CLIENT_HEADER_COMPONENT "client_header")
 set(RDC_LIB_COMPONENT "rdc_lib")
+set(RDC_HEADER_COMPONENT "rdc_header")
 set(GTEST_COMPONENT "rdc_gtest")
 set(EXAMPLE_COMPONENT "rdc_example")
 
@@ -151,7 +152,7 @@ add_subdirectory("rdci")
 set(CPACK_ARCHIVE_COMPONENT_INSTALL ON)
 set(CPACK_COMPONENTS_ALL ${SERVER_CTRL_COMPONENT}
    ${SERVER_BIN_COMPONENT} ${CLIENT_LIB_COMPONENT} ${CLIENT_HEADER_COMPONENT}
-   ${RDC_LIB_COMPONENT})
+   ${RDC_LIB_COMPONENT} ${RDC_HEADER_COMPONENT})
 
 
 configure_file(
diff --git a/projects/rdc/rdc_libs/CMakeLists.txt b/projects/rdc/rdc_libs/CMakeLists.txt
index 2c1face5c5..2eab4b286c 100755
--- a/projects/rdc/rdc_libs/CMakeLists.txt
+++ b/projects/rdc/rdc_libs/CMakeLists.txt
@@ -39,6 +39,7 @@ else ()
     set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ggdb -O0 -DDEBUG")
 endif ()
 
+set(RDC_LIB_ROOT_PATH "${RDC_SERVER_ROOT_PATH}opt/rocm/")
 
 # Required Defines first:
 
@@ -223,10 +224,10 @@ endif ()
 ## Add the install directives for the runtime library.
 install(TARGETS ${BOOTSTRAP_LIB} ${RDC_LIB} ${RDCCLIENT_LIB}
              LIBRARY DESTINATION ${RDC_LIB_ROOT_PATH}${RDC}/lib
-                                            COMPONENT ${RDC_LIB_COMPONENT})
+                                            COMPONENT ${RDCCLIENT_LIB_COMPONENT})
 install(FILES ${SOURCE_DIR}/include/rdc/rdc.h
                       DESTINATION ${RDC_LIB_ROOT_PATH}${RDC}/include/rdc
-                                         COMPONENT ${LIB_HEADER_COMPONENT})
+                                         COMPONENT ${RDC_HEADER_COMPONENT})
 
 message("&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&")
 message("                    Finished Cmake RDC Lib                      ")