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
[ROCm/clr commit: ba04f95771]
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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})
|
||||
|
||||
Reference in New Issue
Block a user