summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpmienk <mienkphi@gmail.com>2014-09-29 08:14:58 (GMT)
committer pmienk <mienkphi@gmail.com>2014-09-29 08:14:58 (GMT)
commit69454e765c1a0fb0799f8981753098f07895ebe6 (patch)
tree3489e78303472f627f113ad208d3c08b62103c0e
parent77681179013c7a940b07c812b2a700f3a71e6849 (diff)
parent652113547e744ad25ecef79ebf6f59ba767f62b2 (diff)
Merge pull request #17 from evoskuil/master
Accomodate change in czmqpp public header name.
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.vcxproj17
-rw-r--r--builds/msvc/vs2013/obelisk/packages.config8
-rw-r--r--include/obelisk/message.hpp2
-rw-r--r--src/worker/publisher.hpp2
-rw-r--r--src/worker/worker.hpp2
5 files changed, 16 insertions, 15 deletions
diff --git a/builds/msvc/vs2013/obelisk/obelisk.vcxproj b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
index 40d4259..6d8f04d 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.vcxproj
+++ b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
@@ -57,6 +57,7 @@
</ItemGroup>
<PropertyGroup Label="Configuration">
<PlatformToolset>CTP_Nov2013</PlatformToolset>
+ <NuGetPackageImportStamp>410c971f</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'" Label="Configuration">
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -228,10 +229,10 @@
<Import Project="..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets" Condition="Exists('..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" />
<Import Project="..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets" Condition="Exists('..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets')" />
<Import Project="..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets')" />
+ <Import Project="..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets" Condition="Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
@@ -247,9 +248,9 @@
<Error Condition="!Exists('..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\zlib.redist.1.2.8.6\build\native\zlib.redist.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\zlib.1.2.8.6\build\native\zlib.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libconfig_vc120.1.4.9.4\build\native\libconfig_vc120.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libsodium_vc120.0.4.5.1\build\native\libsodium_vc120.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.4\build\native\libzmq_vc120.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.7\build\native\czmq_vc120.targets'))" />
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.3\build\native\czmqpp_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libzmq_vc120.4.1.0.7\build\native\libzmq_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmq_vc120.2.2.0.8\build\native\czmq_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\czmqpp_vc120.1.0.0.10\build\native\czmqpp_vc120.targets'))" />
+ <Error Condition="!Exists('..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libsodium_vc120.0.6.0.1\build\native\libsodium_vc120.targets'))" />
</Target>
</Project> \ No newline at end of file
diff --git a/builds/msvc/vs2013/obelisk/packages.config b/builds/msvc/vs2013/obelisk/packages.config
index d87f52c..999c52a 100644
--- a/builds/msvc/vs2013/obelisk/packages.config
+++ b/builds/msvc/vs2013/obelisk/packages.config
@@ -2,12 +2,12 @@
<packages>
<package id="boost" version="1.55.0.16" targetFramework="Native" />
<package id="Crc32C" version="1.0.4" targetFramework="Native" />
- <package id="czmq_vc120" version="2.2.0.7" targetFramework="Native" developmentDependency="true" />
- <package id="czmqpp_vc120" version="1.0.0.3" targetFramework="Native" developmentDependency="true" />
+ <package id="czmq_vc120" version="2.2.0.8" targetFramework="Native" developmentDependency="true" />
+ <package id="czmqpp_vc120" version="1.0.0.10" targetFramework="Native" developmentDependency="true" />
<package id="LevelDB" version="1.16.0.5" targetFramework="Native" />
<package id="libconfig_vc120" version="1.4.9.4" targetFramework="Native" developmentDependency="true" />
- <package id="libsodium_vc120" version="0.4.5.1" targetFramework="Native" developmentDependency="true" />
- <package id="libzmq_vc120" version="4.1.0.4" targetFramework="Native" developmentDependency="true" />
+ <package id="libsodium_vc120" version="0.6.0.1" targetFramework="Native" developmentDependency="true" />
+ <package id="libzmq_vc120" version="4.1.0.7" targetFramework="Native" developmentDependency="true" />
<package id="openssl" version="1.0.1.24" targetFramework="Native" />
<package id="openssl.redist" version="1.0.1.24" targetFramework="Native" />
<package id="Snappy" version="1.1.1.7" targetFramework="Native" />
diff --git a/include/obelisk/message.hpp b/include/obelisk/message.hpp
index 45a01ed..dbfe7e7 100644
--- a/include/obelisk/message.hpp
+++ b/include/obelisk/message.hpp
@@ -1,7 +1,7 @@
#ifndef OBELISK_CLIENT_MESSAGE
#define OBELISK_CLIENT_MESSAGE
-#include <czmq++/czmq.hpp>
+#include <czmq++/czmqpp.hpp>
#include <bitcoin/types.hpp>
namespace obelisk {
diff --git a/src/worker/publisher.hpp b/src/worker/publisher.hpp
index fcff4f8..9ab9e2a 100644
--- a/src/worker/publisher.hpp
+++ b/src/worker/publisher.hpp
@@ -1,7 +1,7 @@
#ifndef QUERY_PUBLISHER_HPP
#define QUERY_PUBLISHER_HPP
-#include <czmq++/czmq.hpp>
+#include <czmq++/czmqpp.hpp>
#include <bitcoin/bitcoin.hpp>
#include "config.hpp"
diff --git a/src/worker/worker.hpp b/src/worker/worker.hpp
index f9dc904..f67f000 100644
--- a/src/worker/worker.hpp
+++ b/src/worker/worker.hpp
@@ -6,7 +6,7 @@
#include <thread>
#include <unordered_map>
#include <boost/date_time/posix_time/posix_time.hpp>
-#include <czmq++/czmq.hpp>
+#include <czmq++/czmqpp.hpp>
#include <obelisk/message.hpp>
#include "config.hpp"
#include "service/util.hpp"