From ba04f95771f2fad1be323410ae42e914900e7cc3 Mon Sep 17 00:00:00 2001 From: Ranjith Ramakrishnan Date: Mon, 22 Aug 2022 23:00:11 -0700 Subject: [PATCH] SWDEV-353137 - Fix for incorrect library path for hiprtc Hiprtc related libraries are duplicated when installed from build directory This happens when cmake install libdir is set with lib64 as default and using hard code path "lib" for LIBRARY_DESTINATION Replaced "lib" with cmake install libdir Removed the default setting of libdir in source code and its should be controlled via build argument Change-Id: Icac55eac9427a5088903d01942e6bfd5263a6fc0 --- hipamd/CMakeLists.txt | 3 --- hipamd/packaging/hip-tests.txt | 2 -- hipamd/src/hiprtc/CMakeLists.txt | 4 ++-- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/hipamd/CMakeLists.txt b/hipamd/CMakeLists.txt index ba80365783..838102344f 100755 --- a/hipamd/CMakeLists.txt +++ b/hipamd/CMakeLists.txt @@ -20,9 +20,6 @@ cmake_minimum_required(VERSION 3.16.8) project(hip) -# Set default libdir to be "lib" for ROCm, distros will override this anyway: -set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory") - include(GNUInstallDirs) # sample command for hip-rocclr runtime, you'll need to have rocclr built diff --git a/hipamd/packaging/hip-tests.txt b/hipamd/packaging/hip-tests.txt index 594b0e5cb0..1ca6031f59 100644 --- a/hipamd/packaging/hip-tests.txt +++ b/hipamd/packaging/hip-tests.txt @@ -20,8 +20,6 @@ cmake_minimum_required(VERSION 3.16.8) project(hip_catch_tests) -# Set default libdir to be "lib" for ROCm, distros/users can override this -set(CMAKE_INSTALL_LIBDIR "lib" CACHE STRING "Library install directory") include(GNUInstallDirs) install(DIRECTORY @PROJECT_BINARY_DIR@/catch diff --git a/hipamd/src/hiprtc/CMakeLists.txt b/hipamd/src/hiprtc/CMakeLists.txt index 0f994e9b01..0f9e306d2f 100644 --- a/hipamd/src/hiprtc/CMakeLists.txt +++ b/hipamd/src/hiprtc/CMakeLists.txt @@ -199,12 +199,12 @@ set(HIPRTC_OBJECTS ${HIPRTC_OBJECTS} PARENT_SCOPE) add_dependencies(hiprtc hiprtc-builtins) install(TARGETS hiprtc-builtins RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) INSTALL(TARGETS hiprtc EXPORT hiprtc-targets RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} - LIBRARY DESTINATION lib + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})