Skip to content

Commit

Permalink
Merge pull request #4555 from bluca/relicense
Browse files Browse the repository at this point in the history
Relicense from LGPL3 + exceptions to Mozilla Public License version 2.0
  • Loading branch information
bluca authored Jun 6, 2023
2 parents 87bb4db + 3e5e405 commit 1a921db
Show file tree
Hide file tree
Showing 780 changed files with 832 additions and 17,866 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1174,7 +1174,7 @@ endif()

set(public_headers include/zmq.h include/zmq_utils.h)

set(readme-docs AUTHORS COPYING COPYING.LESSER NEWS)
set(readme-docs AUTHORS LICENSE NEWS)

# -----------------------------------------------------------------------------
# optional modules
Expand Down Expand Up @@ -1789,7 +1789,7 @@ if(MSVC AND ENABLE_CPACK)
set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "ZeroMQ lightweight messaging kernel")
set(CPACK_PACKAGE_VENDOR "Miru")
set(CPACK_NSIS_CONTACT "Steven McCoy <[email protected]>")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}\\\\COPYING.txt")
set(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_BINARY_DIR}\\\\LICENSE.txt")
# set(CPACK_RESOURCE_FILE_README "${CMAKE_CURRENT_BINARY_DIR}\\\\README.txt") set(CPACK_RESOURCE_FILE_WELCOME
# "${CMAKE_CURRENT_BINARY_DIR}\\\\WELCOME.txt") There is a bug in NSI that does not handle full unix paths properly.
# Make sure there is at least one set of four(4) backslashes.
Expand Down
674 changes: 0 additions & 674 deletions COPYING

This file was deleted.

181 changes: 0 additions & 181 deletions COPYING.LESSER

This file was deleted.

Loading

0 comments on commit 1a921db

Please sign in to comment.