summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorevoskuil <eric@voskuil.org>2014-04-08 06:46:23 (GMT)
committer evoskuil <eric@voskuil.org>2014-04-08 06:46:23 (GMT)
commit4cf58803ac9041487953065ebfd2e9cb1f5d8d1e (patch)
tree2b4ec26a057fe3fcce33b0daca35eb7293c56987
parentbb9245189a67c528179c6c5b679c2133aad878dd (diff)
Add czmqpp nuget settings.
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.props46
-rw-r--r--builds/msvc/vs2013/obelisk/obelisk.vcxproj53
-rw-r--r--builds/msvc/vs2013/obelisk/packages.config6
3 files changed, 54 insertions, 51 deletions
diff --git a/builds/msvc/vs2013/obelisk/obelisk.props b/builds/msvc/vs2013/obelisk/obelisk.props
index 47cfa0f..2824cb2 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.props
+++ b/builds/msvc/vs2013/obelisk/obelisk.props
@@ -8,9 +8,11 @@
<RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup>
+ <!-- Configuration -->
+
<ItemDefinitionGroup>
<ClCompile>
- <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\..\libbitcoin\include\;$(ProjectDir)..\..\..\..\..\czmqpp\include\;$(ProjectDir)..\..\..\..\..\czmq\include\;$(ProjectDir)..\..\..\..\..\libzmq\include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+ <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories);$(ProjectDir)..\..\..\..\..\libbitcoin\include\;(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<DisableSpecificWarnings>4290;4275;%(DisableSpecificWarnings)</DisableSpecificWarnings>
<EnablePREfast>false</EnablePREfast>
<PreprocessorDefinitions>LEVELDB_ENABLED;_WIN32_WINNT=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -20,20 +22,50 @@
</Link>
</ItemDefinitionGroup>
- <ItemDefinitionGroup Condition="'$(ConfigurationType)'=='StaticLibrary'">
- <ClCompile>
- <PreprocessorDefinitions>LIBCONFIG_STATIC;LIBCONFIGXX_STATIC;ZMQ_STATIC;LIBCZMQ_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
- </ClCompile>
- </ItemDefinitionGroup>
-
<ItemDefinitionGroup Condition="$(Configuration.IndexOf('Release')) != -1">
<ClCompile>
<PreprocessorDefinitions>BITCOIN_DISABLE_ASSERTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>
+ <!-- Extensions -->
+
+ <PropertyGroup Condition="$(Configuration.IndexOf('DLL')) != -1">
+ <Linkage-libconfig>dynamic</Linkage-libconfig>
+ <Linkage-zlib>dynamic</Linkage-zlib>
+ <Linkage-openssl>dynamic</Linkage-openssl>
+ <Linkage-czmqpp>dynamic</Linkage-czmqpp>
+ <Linkage-czmq>dynamic</Linkage-czmq>
+ <Linkage-libzmq>dynamic</Linkage-libzmq>
+ <Linkage-libsodium>dynamic</Linkage-libsodium>
+ </PropertyGroup>
+ <PropertyGroup Condition="$(Configuration.IndexOf('LTCG')) != -1">
+ <Linkage-libconfig>ltcg</Linkage-libconfig>
+ <Linkage-zlib>ltcg</Linkage-zlib>
+ <Linkage-openssl>ltcg</Linkage-openssl>
+ <Linkage-czmqpp>ltcg</Linkage-czmqpp>
+ <Linkage-czmq>ltcg</Linkage-czmq>
+ <Linkage-libzmq>ltcg</Linkage-libzmq>
+ <Linkage-libsodium>ltcg</Linkage-libsodium>
+ </PropertyGroup>
+ <PropertyGroup Condition="$(Configuration.IndexOf('LIB')) != -1">
+ <Linkage-libconfig>static</Linkage-libconfig>
+ <Linkage-zlib>static</Linkage-zlib>
+ <Linkage-openssl>static</Linkage-openssl>
+ <Linkage-czmqpp>static</Linkage-czmqpp>
+ <Linkage-czmq>static</Linkage-czmq>
+ <Linkage-libzmq>static</Linkage-libzmq>
+ <Linkage-libsodium>static</Linkage-libsodium>
+ </PropertyGroup>
+
+ <!-- Messages -->
+
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libconfig : $(Linkage-libconfig)" Importance="high"/>
+ <Message Text="Linkage-czmqpp : $(Linkage-czmqpp)" Importance="high"/>
+ <Message Text="Linkage-czmq : $(Linkage-czmq)" Importance="high"/>
+ <Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
+ <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
<Message Text="Linkage-zlib : $(Linkage-zlib)" Importance="high"/>
<Message Text="Linkage-openssl : $(Linkage-openssl)" Importance="high"/>
</Target>
diff --git a/builds/msvc/vs2013/obelisk/obelisk.vcxproj b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
index b9617a1..75991bd 100644
--- a/builds/msvc/vs2013/obelisk/obelisk.vcxproj
+++ b/builds/msvc/vs2013/obelisk/obelisk.vcxproj
@@ -168,46 +168,6 @@
<Import Project="$(ProjectDir)..\properties\StaticRelease.props" />
<Import Project="$(ProjectDir)..\properties\x64.props" />
</ImportGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|Win32'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLTCG|x64'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|x64'">
- <Linkage-libconfig>ltcg</Linkage-libconfig>
- <Linkage-zlib>ltcg</Linkage-zlib>
- <Linkage-openssl>ltcg</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|Win32'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|Win32'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugLIB|x64'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
- <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLIB|x64'">
- <Linkage-libconfig>static</Linkage-libconfig>
- <Linkage-zlib>static</Linkage-zlib>
- <Linkage-openssl>static</Linkage-openssl>
- </PropertyGroup>
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
@@ -255,7 +215,6 @@
<ClInclude Include="..\..\..\..\src\worker\subscribe_manager.hpp" />
<ClInclude Include="..\..\..\..\src\worker\worker.hpp" />
</ItemGroup>
- <!-- Move these? -->
<Import Project="..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props" Condition="Exists('..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props')" />
<Import Project="..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props" Condition="Exists('..\..\..\..\..\..\nuget\Snappy.1.1.1.7\build\native\Snappy.props')" />
<Import Project="..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props" Condition="Exists('..\..\..\..\..\..\nuget\Crc32C.1.0.4\build\native\Crc32C.props')" />
@@ -264,17 +223,20 @@
<ImportGroup Label="ExtensionTargets" />
<ImportGroup Label="ExtensionSettings">
<Import Project="..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets" Condition="Exists('..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets')" />
- <Import Project="..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets" Condition="Exists('..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets')" />
<Import Project="..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" />
<Import Project="..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets" Condition="Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.targets')" />
<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')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
- <Error Condition="!Exists('..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\libconfig.1.4.9.2\build\native\package.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\boost.1.55.0.16\build\native\boost.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.redist.1.0.1.24\build\native\openssl.redist.targets'))" />
<Error Condition="!Exists('..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\openssl.1.0.1.24\build\native\openssl.props'))" />
@@ -284,5 +246,10 @@
<Error Condition="!Exists('..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\..\..\..\nuget\LevelDB.1.16.0.5\build\native\LevelDB.props'))" />
<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'))" />
</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 2567b4f..d87f52c 100644
--- a/builds/msvc/vs2013/obelisk/packages.config
+++ b/builds/msvc/vs2013/obelisk/packages.config
@@ -2,8 +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="LevelDB" version="1.16.0.5" targetFramework="Native" />
- <package id="libconfig" version="1.4.9.2" 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="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" />