From 79d82382b3ea1b7d77e3a47a96a786557588787a Mon Sep 17 00:00:00 2001 From: Max Gaukler Date: Tue, 11 Sep 2018 16:05:17 +0200 Subject: Clarify licenses - add license headers to everything - convert a few files from public domain or LGPL2.1+ to GPL2+ - some archaeology to clarify which files are from which library --- CMakeScripts/ConfigCPack.cmake | 2 +- CMakeScripts/Install.cmake | 6 +++--- CMakeScripts/InstallMSYS2.cmake | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'CMakeScripts') diff --git a/CMakeScripts/ConfigCPack.cmake b/CMakeScripts/ConfigCPack.cmake index 0e8421737..b2b8f8f59 100644 --- a/CMakeScripts/ConfigCPack.cmake +++ b/CMakeScripts/ConfigCPack.cmake @@ -10,7 +10,7 @@ set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Inkscape, open-source vector graphics edi set(CPACK_PACKAGE_VENDOR "Inkscape") set(CPACK_PACKAGE_CONTACT "Inkscape developers ") set(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README.md") -set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/GPL2.txt") +set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/LICENSES/GPL-3.0.txt") set(CPACK_PACKAGE_VERSION_MAJOR ${INKSCAPE_VERSION_MAJOR}) set(CPACK_PACKAGE_VERSION_MINOR ${INKSCAPE_VERSION_MINOR}) set(CPACK_PACKAGE_VERSION_PATCH ${INKSCAPE_VERSION_PATCH}) diff --git a/CMakeScripts/Install.cmake b/CMakeScripts/Install.cmake index 131ee0701..beaf5aa0a 100644 --- a/CMakeScripts/Install.cmake +++ b/CMakeScripts/Install.cmake @@ -12,9 +12,9 @@ if(WIN32) NEWS.md README.md TRANSLATORS - GPL2.txt - GPL3.txt - LGPL2.1.txt + LICENSES/GPL-2.0.txt + LICENSES/GPL-3.0.txt + LICENSES/LGPL-2.1.txt DESTINATION .) install(DIRECTORY doc diff --git a/CMakeScripts/InstallMSYS2.cmake b/CMakeScripts/InstallMSYS2.cmake index b2e0916fe..66a06bae5 100644 --- a/CMakeScripts/InstallMSYS2.cmake +++ b/CMakeScripts/InstallMSYS2.cmake @@ -5,9 +5,9 @@ if(WIN32) NEWS.md README.md TRANSLATORS - GPL2.txt - GPL3.txt - LGPL2.1.txt + LICENSES/GPL-2.0.txt + LICENSES/GPL-3.0.txt + LICENSES/LGPL-2.1.txt DESTINATION .) install(DIRECTORY doc @@ -263,4 +263,4 @@ if(WIN32) EXCLUDE "^\\.\\.\\/" # exclude content in parent directories (notably scripts installed to /bin) ) endforeach() -endif() \ No newline at end of file +endif() -- cgit v1.2.3