Skip to content

Commit c2e2cae

Browse files
committed
Bump czmqpp version references.
1 parent 44e3399 commit c2e2cae

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

builds/msvc/vs2013/bitcoin-server/bitcoin-server.vcxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@
120120
<Import Project="..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_regex-vc120.1.56.0.0\build\native\boost_regex-vc120.targets')" />
121121
<Import Project="..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost_system-vc120.1.56.0.0\build\native\boost_system-vc120.targets')" />
122122
<Import Project="..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets')" />
123-
<Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.11\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.11\build\native\czmqpp_vc120.targets')" />
123+
<Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" />
124124
<Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets')" />
125125
<Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" />
126126
<Import Project="..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets')" />
@@ -138,7 +138,7 @@
138138
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libsodium_vc120.1.0.0.0\build\native\libsodium_vc120.targets'))" />
139139
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.2.0.0\build\native\libzmq_vc120.targets'))" />
140140
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.3.0.1.0\build\native\czmq_vc120.targets'))" />
141-
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.11\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.11\build\native\czmqpp_vc120.targets'))" />
141+
<Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.1.0.0\build\native\czmqpp_vc120.targets'))" />
142142
<Error Condition="!Exists('..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\secp256k1_vc120.0.1.0.4\build\native\secp256k1_vc120.targets'))" />
143143
</Target>
144144
</Project>

builds/msvc/vs2013/bitcoin-server/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<package id="boost_regex-vc120" version="1.56.0.0" targetFramework="Native" />
88
<package id="boost_system-vc120" version="1.56.0.0" targetFramework="Native" />
99
<package id="czmq_vc120" version="3.0.1.0" targetFramework="Native" />
10-
<package id="czmqpp_vc120" version="1.0.0.11" targetFramework="Native" />
10+
<package id="czmqpp_vc120" version="1.1.0.0" targetFramework="Native" />
1111
<package id="libsodium_vc120" version="1.0.0.0" targetFramework="Native" />
1212
<package id="libzmq_vc120" version="4.2.0.0" targetFramework="Native" />
1313
<package id="secp256k1_vc120" version="0.1.0.4" targetFramework="Native" />

configure.ac

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ AS_IF([test x$bash_completion_dir = xyes],
128128
# The chained zmq dependency doesn't set a minimum version for sodium.
129129
PKG_CHECK_MODULES([sodium], [libsodium >= 1.0.0])
130130

131-
# Require czmq++ of at least version 0.4.1 and output ${czmq___CFLAGS} and ${czmq___LIBS}.
131+
# Require czmq++ of at least version 1.1.0 and output ${czmq___CFLAGS} and ${czmq___LIBS}.
132132
#------------------------------------------------------------------------------
133-
PKG_CHECK_MODULES([czmq__], [libczmq++ >= 0.4.1])
133+
PKG_CHECK_MODULES([czmq__], [libczmq++ >= 1.1.0])
134134

135135
# Require bitcoin-node of at least version 2.0.0 and output ${bitcoin_node_CFLAGS} and ${bitcoin_node_LIBS}.
136136
#------------------------------------------------------------------------------

libbitcoin-server.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ URL: https://github.com/libbitcoin/libbitcoin-server
1616
Version: @PACKAGE_VERSION@
1717

1818
# Our dependencies that publish package configuration.
19-
Requires: libsodium >= 1.0.0 libczmq++ >= 0.4.1 libbitcoin-node >= 2.0.0
19+
Requires: libsodium >= 1.0.0 libczmq++ >= 1.1.0 libbitcoin-node >= 2.0.0
2020

2121
# Our own include directory and any other compiler flags we require.
2222
Cflags: -I${includedir} -std=c++11

0 commit comments

Comments
 (0)