From 60c5f03d099a072d65429e11332bd825783c81c3 Mon Sep 17 00:00:00 2001 From: Liam Wrubleski Date: Tue, 25 Jan 2022 12:31:42 -0700 Subject: [PATCH] Hotfix: License & rocm-cmake fixes (#1232) * set RPM license type * Move license installation to rocm-cmake * Switch component --- library/CMakeLists.txt | 3 ++- library/src/CMakeLists.txt | 9 ++------- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt index c8546d381..9735d3a0e 100755 --- a/library/CMakeLists.txt +++ b/library/CMakeLists.txt @@ -1,5 +1,5 @@ # ######################################################################## -# Copyright 2016-2021 Advanced Micro Devices, Inc. +# Copyright 2016-2022 Advanced Micro Devices, Inc. # ######################################################################## # The following helper functions wrap common cmake functions. They are @@ -142,6 +142,7 @@ endif() set( CPACK_RPM_PACKAGE_REQUIRES ${RPM_REQUIREMENTS} ) set( CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/../LICENSE.md" ) +set( CPACK_RPM_PACKAGE_LICENSE "MIT and BSD") if (WIN32) SET( CMAKE_INSTALL_PREFIX "C:/hipSDK" CACHE PATH "Install path" FORCE ) diff --git a/library/src/CMakeLists.txt b/library/src/CMakeLists.txt index 4f5e4572d..84bb69c71 100755 --- a/library/src/CMakeLists.txt +++ b/library/src/CMakeLists.txt @@ -1,5 +1,5 @@ # ######################################################################## -# Copyright 2016-2021 Advanced Micro Devices, Inc. +# Copyright 2016-2022 Advanced Micro Devices, Inc. # ######################################################################## # ######################################################################## @@ -515,11 +515,6 @@ rocm_install(FILES "../include/rocblas_module.f90" DESTINATION "rocblas/include" ) -# Force installation of LICENSE.md -install(FILES "../../LICENSE.md" - DESTINATION "share/doc/rocBLAS" -) - rocm_install_targets( TARGETS ${package_targets} INCLUDE @@ -537,7 +532,7 @@ if( BUILD_WITH_TENSILE ) rocm_install( DIRECTORY ${CMAKE_BINARY_DIR}/Tensile/library DESTINATION ${ROCBLAS_TENSILE_LIBRARY_DIR} - COMPONENT Unspecified) + COMPONENT ${CMAKE_INSTALL_DEFAULT_COMPONENT_NAME}) # Use this cmake variable to be compatible with rocm-cmake 0.6 and 0.7 endif() # PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ