From 312461ebe5ad9dd5874df4f25b815b9385b83e22 Mon Sep 17 00:00:00 2001 From: "Jonathan R. Madsen" Date: Wed, 24 Apr 2024 01:19:32 -0500 Subject: [PATCH] Fix LICENSE install location + CPACK_RPM_PACKAGE_LICENSE (#820) - LICENSE needs to be installed in share/doc/rocprofiler-sdk not share/doc/rocprofiler - CPACK_RPM_PACKAGE_LICENSE should be set to license type not the license location [ROCm/rocprofiler-sdk commit: 5d365bb8b8616ee17f0401fffb5b6644e00c2554] --- .../cmake/rocprofiler_config_install.cmake | 5 +++++ .../cmake/rocprofiler_config_packaging.cmake | 8 +------- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake index 55da945b45..295a3f5a9a 100644 --- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake +++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_install.cmake @@ -5,6 +5,11 @@ include(CMakePackageConfigHelpers) set(CMAKE_INSTALL_DEFAULT_COMPONENT_NAME development) +install( + FILES ${PROJECT_SOURCE_DIR}/LICENSE + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/doc/${PACKAGE_NAME} + COMPONENT core) + install( DIRECTORY ${PROJECT_SOURCE_DIR}/samples DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PACKAGE_NAME} diff --git a/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake b/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake index 6a7b839ce9..3570ec1596 100644 --- a/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake +++ b/projects/rocprofiler-sdk/cmake/rocprofiler_config_packaging.cmake @@ -122,12 +122,6 @@ foreach(COMPONENT_GROUP ${ROCPROFILER_COMPONENT_GROUPS}) endforeach() endforeach() -# Install license file -install( - FILES ${CPACK_RESOURCE_FILE_LICENSE} - DESTINATION ${CMAKE_INSTALL_DOCDIR} - COMPONENT core) - # -------------------------------------------------------------------------------------- # # # Debian package specific variables @@ -196,7 +190,7 @@ if(CPACK_RPM_PACKAGE_RELEASE) set(CPACK_RPM_PACKAGE_RELEASE_DIST ON) endif() set(CPACK_RPM_FILE_NAME "RPM-DEFAULT") -set(CPACK_RPM_PACKAGE_LICENSE "${PROJECT_SOURCE_DIR}/LICENSE") +set(CPACK_RPM_PACKAGE_LICENSE "MIT") # -------------------------------------------------------------------------------------- # #