Skip to content

Commit

Permalink
Merge bitcoin/bitcoin#30753: build: Drop no longer needed workaround
Browse files Browse the repository at this point in the history
66dd1b4 build: Drop no longer needed workaround (Hennadii Stepanov)

Pull request description:

  This PR deletes a workaround that is no longer needed since bitcoin/bitcoin#30508 was merged.

ACKs for top commit:
  fanquake:
    ACK 66dd1b4

Tree-SHA512: abb8e79b525989afe88f94899e4dc29c80d4593ea23f44c6b3d08710e6ddd1619e748798534973fa4ee9f48d9fad7226445b7a2cb4aec0bdb5d1b7ff2f6689ea
  • Loading branch information
fanquake committed Aug 30, 2024
2 parents 3ee1521 + 66dd1b4 commit c91cabb
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -148,11 +148,6 @@ if(WITH_ZMQ)
# TODO: Switch to find_package(ZeroMQ) at some point in the future.
find_package(PkgConfig REQUIRED)
pkg_check_modules(libzmq REQUIRED IMPORTED_TARGET libzmq>=4)
# TODO: This command will be redundant once
# https://github.com/bitcoin/bitcoin/pull/30508 is merged.
target_link_libraries(PkgConfig::libzmq INTERFACE
$<$<PLATFORM_ID:Windows>:iphlpapi;ws2_32>
)
endif()
endif()

Expand Down

0 comments on commit c91cabb

Please sign in to comment.