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})