From 759cd843dba287625e6768ced97ebb87c10e2da5 Mon Sep 17 00:00:00 2001 From: Brad King Date: Sun, 2 Mar 2025 19:39:50 -0500 Subject: [PATCH] CMake: De-duplicate references to license file --- CMakeCPack.cmake | 4 ++-- CMakeLists.txt | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeCPack.cmake b/CMakeCPack.cmake index a0c0e54ffa..e6bd57a064 100644 --- a/CMakeCPack.cmake +++ b/CMakeCPack.cmake @@ -14,10 +14,10 @@ if(CMake_INSTALL_DEPENDENCIES) include(${CMake_SOURCE_DIR}/Modules/InstallRequiredSystemLibraries.cmake) endif() +set(CPACK_RESOURCE_FILE_LICENSE "${CMake_LICENSE_FILE}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "CMake is a build tool") set(CPACK_PACKAGE_VENDOR "Kitware") -set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/Copyright.txt") +set(CPACK_PACKAGE_DESCRIPTION_FILE "${CPACK_RESOURCE_FILE_LICENSE}") set(CPACK_PACKAGE_NAME "${CMAKE_PROJECT_NAME}") set(CPACK_PACKAGE_VERSION "${CMake_VERSION}") set(CPACK_PACKAGE_INSTALL_DIRECTORY "${CPACK_PACKAGE_NAME}") diff --git a/CMakeLists.txt b/CMakeLists.txt index 2887d3e03e..d7fd071f6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -534,7 +534,9 @@ endif() if(NOT CMake_TEST_EXTERNAL_CMAKE) # Install license file as it requires. - install(FILES Copyright.txt DESTINATION ${CMAKE_DOC_DIR}) + install(FILES + "${CMake_LICENSE_FILE}" + DESTINATION ${CMAKE_DOC_DIR}) # Install script directories. install(