From 52ff66f4fc29889432c26876b3edfc57c1f7c41d Mon Sep 17 00:00:00 2001 From: Vladislav Sytchenko Date: Thu, 10 Jun 2021 00:10:22 -0700 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: I46e405b25bda987e74b095fcb41319f8a504ae41 --- hipamd/CMakeLists.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index 29a8f9b75a..dfc86d2829 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -246,10 +246,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::) @@ -257,7 +262,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::)