From db8e2f3d48d3b7e0a61b3d0592b5200e94fadcc5 Mon Sep 17 00:00:00 2001 From: Otto Urpelainen Date: Tue, 8 Mar 2022 23:14:27 +0200 Subject: [PATCH] Remove license definition from CMakeLists The CPACK_RESOURCE_LICENSE statement in CMakeLists.txt was incorrect. The toplevel CMakeLists can be used to build any of the subprojects. These subprojects have different licenses, thus using a license from just one of them is not correct. Removing the statement is useful, because it allows building just some subprojects without referencing the source of others. The practical situation where is came is in Fedora rpm build. Only the mt32emu library is included in Fedora, thus the build script starts by removing other subprojects. Referring to mt32emu_qt subproject from CMakeLists.txt prevents doing this properly. --- CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 410895cd..62f4191e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -52,7 +52,6 @@ set(CPACK_PACKAGE_VERSION_PATCH "${munt_VERSION_PATCH}") set(CPACK_PACKAGE_VENDOR "muntemu.org") set(CPACK_PACKAGE_CONTACT "${munt_CONTACT}") set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "${munt_DESCRIPTION_SUMMARY}") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/mt32emu_qt/COPYING.txt") set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_SOURCE_DIR}/README.md") set(CPACK_STRIP_FILES TRUE) # The default package file name has "-${CPACK_SYSTEM_NAME}" at the end, which doesn't match our previous releases -- 2.35.1