From 261b237f17523154138f7cb5c1d1b42cbced9622 Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Mon, 7 Jun 2021 16:01:51 -0400 Subject: [PATCH] SWDEV-289854 - Revert to using hardcoded library destination Current packaging assumes that HIP runtime will always be installed in /opt/rocm/lib. This is false to assume, because some distros like CentOS will use the lib64 directory instead of lib. Relying on CMake to choose the library directory for us will default in that case to lib64. Hence there will be a mismatch between where HIP is installed and where CMake thinks it is. Change-Id: If6f881eab027bdbe8435d3de5295b00277e96a6a [ROCm/hip commit: ed9e4ee7df9b4cfc5f85235e4ebd9b7288b1681c] --- projects/hip/src/hipamd/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/projects/hip/src/hipamd/CMakeLists.txt b/projects/hip/src/hipamd/CMakeLists.txt index 4982fb93f6..7362b0975d 100755 --- a/projects/hip/src/hipamd/CMakeLists.txt +++ b/projects/hip/src/hipamd/CMakeLists.txt @@ -247,10 +247,15 @@ target_link_libraries(host INTERFACE amdhip64) add_library(device INTERFACE) target_link_libraries(device INTERFACE host) +# Current packaging assumes that HIP runtime will always be installed in /opt/rocm/lib +# This is false to assume, because some distros like CentOS will use the lib64 directory instead of lib +# Relying on CMake to choose the library directory for us will default in that case to lib64 +# Hence there will be a mismatch between where HIP is installed and where CMake thinks it is + INSTALL(TARGETS amdhip64 host device EXPORT hip-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION lib ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) INSTALL(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE hip::) @@ -258,7 +263,7 @@ INSTALL(EXPORT hip-targets DESTINATION ${CONFIG_PACKAGE_INSTALL_DIR} NAMESPACE h INSTALL(TARGETS amdhip64 host device EXPORT hip-lang-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + LIBRARY DESTINATION lib ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) INSTALL(EXPORT hip-lang-targets DESTINATION ${CONFIG_LANG_PACKAGE_INSTALL_DIR} NAMESPACE hip-lang::)