From 526b87670be850987fd5a5d7b5ba5b25c51cba27 Mon Sep 17 00:00:00 2001 From: Henrik Hautakoski Date: Tue, 7 Apr 2020 17:16:07 +0200 Subject: [PATCH] remove LICENSE.bitcoin (this code exist in libeosio) --- CMakeLists.txt | 10 ++-------- LICENSE.bitcoin | 22 ---------------------- 2 files changed, 2 insertions(+), 30 deletions(-) delete mode 100644 LICENSE.bitcoin diff --git a/CMakeLists.txt b/CMakeLists.txt index 197a292..13db013 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,7 +78,7 @@ target_link_libraries( ${PROGRAM_EXE} PUBLIC common ) install(TARGETS ${PROGRAM_EXE} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) # Readme and license -install(FILES README.md LICENSE LICENSE.bitcoin +install(FILES README.md LICENSE DESTINATION ${CMAKE_INSTALL_SHAREDIR}) # Documentation @@ -95,13 +95,7 @@ endif (UNIX) # -------------------------------- if (CPACK_GENERATOR MATCHES "^[Nn][Ss][Ii][Ss]$") - set( NSIS_LICENSE_FILE ${PROJECT_BINARY_DIR}/NSIS_LICENSE ) - file(WRITE ${NSIS_LICENSE_FILE} "") - foreach(file IN ITEMS LICENSE LICENSE.bitcoin) - file(READ ${CMAKE_CURRENT_LIST_DIR}/${file} content) - file(APPEND ${NSIS_LICENSE_FILE} "--- ${file}\n\n${content}\n") - endforeach() - set( CPACK_RESOURCE_FILE_LICENSE ${NSIS_LICENSE_FILE} ) + set( CPACK_RESOURCE_FILE_LICENSE ${CMAKE_CURRENT_LIST_DIR}/LICENSE ) endif() set( CPACK_DEBIAN_PACKAGE_PRIORITY "optional" ) diff --git a/LICENSE.bitcoin b/LICENSE.bitcoin deleted file mode 100644 index 9d54ecb..0000000 --- a/LICENSE.bitcoin +++ /dev/null @@ -1,22 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2009-2019 The Bitcoin Core developers -Copyright (c) 2009-2019 Bitcoin Developers - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN -THE SOFTWARE.