From 7938d5517963cadd2b01d32047f0d618ce124bd7 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 16 Apr 2024 13:55:23 +0200 Subject: [PATCH 1/2] fix call to COPY_FILE on cmake < 3.21 file(COPY_FILE is added in cmake 3.21 configure_file( ...COPYONLY) does the same thing --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 54469841f..1505c8e59 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -190,7 +190,7 @@ if (ZMQ_PREFIX STREQUAL "bundled") PREFIX ${BUNDLE_DIR} ) FetchContent_MakeAvailable(bundled_libsodium) - file(COPY_FILE "${bundled_libsodium_SOURCE_DIR}/LICENSE" "${LICENSE_DIR}/LICENSE.libsodium.txt") + configure_file("${bundled_libsodium_SOURCE_DIR}/LICENSE" "${LICENSE_DIR}/LICENSE.libsodium.txt" COPYONLY) # run libsodium build explicitly here, so it's available to libzmq next set(bundled_libsodium_include "${bundled_libsodium_SOURCE_DIR}/src/libsodium/include") @@ -237,7 +237,7 @@ if (ZMQ_PREFIX STREQUAL "bundled") endif() file(GLOB_RECURSE BUILT_LIB "${bundled_libsodium_SOURCE_DIR}/**/libsodium.lib") message(STATUS "copy ${BUILT_LIB} ${libsodium_lib}") - file(COPY_FILE ${BUILT_LIB} ${libsodium_lib}) + configure_file(${BUILT_LIB} ${libsodium_lib} COPYONLY) else() list(APPEND libsodium_configure ./configure @@ -321,7 +321,7 @@ if (ZMQ_PREFIX STREQUAL "bundled") PREFIX ${BUNDLE_DIR} ) FetchContent_MakeAvailable(bundled_libzmq) - file(COPY_FILE "${bundled_libzmq_SOURCE_DIR}/LICENSE" "${LICENSE_DIR}/LICENSE.zeromq.txt") + configure_file("${bundled_libzmq_SOURCE_DIR}/LICENSE" "${LICENSE_DIR}/LICENSE.zeromq.txt" COPYONLY) # target for libzmq static if (TARGET libzmq-static) From 88c4731de0d17fc00f14d17c9afce20c395d6c16 Mon Sep 17 00:00:00 2001 From: Min RK Date: Tue, 16 Apr 2024 13:57:07 +0200 Subject: [PATCH 2/2] changelog for 26.0.1 --- docs/source/changelog.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/docs/source/changelog.md b/docs/source/changelog.md index 7e38d4dab..efa08e2f8 100644 --- a/docs/source/changelog.md +++ b/docs/source/changelog.md @@ -7,6 +7,12 @@ For a full changelog, consult the [git log](https://github.com/zeromq/pyzmq/comm ## 26 +### 26.0.1 + +- Fix install from source with cmake \< 3.21 + +### 26.0.0 + pyzmq 26 is a small release, but with some big changes _hopefully_ nobody will notice, except for some users (especially on Windows) where pyzmq releases did not work.