Skip to content

Commit

Permalink
Merge pull request #1977 from minrk/configure_file
Browse files Browse the repository at this point in the history
fix builds with cmake < 3.21
  • Loading branch information
minrk authored Apr 19, 2024
2 parents dd3a253 + 88c4731 commit 81d5cd0
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
6 changes: 3 additions & 3 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand Down
6 changes: 6 additions & 0 deletions docs/source/changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down

0 comments on commit 81d5cd0

Please sign in to comment.