Restoring the correct installation path
SWDEV-532187: The installation was failing
because of the same path used in all of the
packages. This patch seprates the same.
Signed-off-by: Ashutosh Mishra <ashutosh.mishra@amd.com>
[ROCm/rocm-core commit: fcd3952708]
This commit is contained in:
@@ -37,9 +37,27 @@ set( CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options ar
|
||||
|
||||
## Verbose output.
|
||||
set( CMAKE_VERBOSE_MAKEFILE on )
|
||||
include( GNUInstallDirs )
|
||||
|
||||
if(ENABLE_ASAN_PACKAGING)
|
||||
# Only libraries required for ASAN Package
|
||||
set( CPACK_COMPONENTS_ALL CORE_ASAN )
|
||||
set( COMP_TYPE "CORE_ASAN" )
|
||||
set( PKG_DESCRIPTION "ROCm AddressSanitizer Instrumented Runtime software stack" )
|
||||
set( CMAKE_INSTALL_DOCDIR "${CMAKE_INSTALL_DOCDIR}-asan" )
|
||||
else()
|
||||
if(BUILD_SHARED_LIBS)
|
||||
set( CPACK_COMPONENTS_ALL CORE_RUNTIME )
|
||||
set( COMP_TYPE "CORE_RUNTIME" )
|
||||
set( PKG_DESCRIPTION "ROCm Runtime software stack" )
|
||||
else()
|
||||
set( CPACK_COMPONENTS_ALL CORE_STATIC )
|
||||
set( STATIC_COMP_TYPE "CORE_STATIC" )
|
||||
set( PKG_DESCRIPTION "ROCm Static software stack" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
include( utils.cmake )
|
||||
include( GNUInstallDirs )
|
||||
|
||||
#Parse Version
|
||||
message( STATUS "ROCM_VERSION = ${ROCM_VERSION}" )
|
||||
@@ -101,23 +119,6 @@ set( SO_VERSION_STRING "${SO_MAJOR}.${SO_MINOR}.${ROCM_LIBPATCH_VERSION}" )
|
||||
set_property( TARGET ${CORE_TARGET} PROPERTY VERSION "${SO_VERSION_STRING}" )
|
||||
set_property( TARGET ${CORE_TARGET} PROPERTY SOVERSION "${SO_MAJOR}" )
|
||||
|
||||
if(ENABLE_ASAN_PACKAGING)
|
||||
# Only libraries required for ASAN Package
|
||||
set( CPACK_COMPONENTS_ALL CORE_ASAN )
|
||||
set( COMP_TYPE "CORE_ASAN" )
|
||||
set( PKG_DESCRIPTION "ROCm AddressSanitizer Instrumented Runtime software stack" )
|
||||
else()
|
||||
if(BUILD_SHARED_LIBS)
|
||||
set( CPACK_COMPONENTS_ALL CORE_RUNTIME )
|
||||
set( COMP_TYPE "CORE_RUNTIME" )
|
||||
set( PKG_DESCRIPTION "ROCm Runtime software stack" )
|
||||
else()
|
||||
set( CPACK_COMPONENTS_ALL CORE_STATIC )
|
||||
set( STATIC_COMP_TYPE "CORE_STATIC" )
|
||||
set( PKG_DESCRIPTION "ROCm Static software stack" )
|
||||
endif()
|
||||
endif()
|
||||
|
||||
#Add the libpatch version if available to the version file
|
||||
if( DEFINED VERSION_POINT )
|
||||
file ( WRITE "${CMAKE_CURRENT_BINARY_DIR}/version" "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}.${VERSION_POINT}\n" )
|
||||
@@ -148,9 +149,6 @@ if(BUILD_SHARED_LIBS)
|
||||
install ( FILES ${LICENSE_FILE}
|
||||
DESTINATION ${CMAKE_INSTALL_DOCDIR} RENAME LICENSE.txt
|
||||
COMPONENT CORE_RUNTIME)
|
||||
install ( FILES ${LICENSE_FILE} DESTINATION
|
||||
${CMAKE_INSTALL_DOCDIR}-asan RENAME LICENSE.txt
|
||||
COMPONENT CORE_ASAN)
|
||||
else()
|
||||
install ( FILES ${BUILD_DIR}/version
|
||||
DESTINATION .info
|
||||
|
||||
Fai riferimento in un nuovo problema
Block a user