Skip to content

L
libzmq
Commit ff6b684a authored by Richard Newton's avatar Richard Newton
Browse files
Options

Merge pull request #1076 from dmeehan1968/msvc-platform-hpp-no-copy 

Remove copy of platform.hpp for MSVC VS2013 builds
parents d0371dc0 d775b453
Hide whitespace changes
Inline Side-by-side
Showing with 29 additions and 62 deletions
builds/msvc/vs2013/inproc_lat/inproc_lat.props
View file @ ff6b684a
......@@ -10,9 +10,9 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
......@@ -40,10 +40,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
......
builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
View file @ ff6b684a
......@@ -64,7 +64,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\perf\inproc_lat.cpp" />
......
builds/msvc/vs2013/inproc_thr/inproc_thr.props
View file @ ff6b684a
......@@ -10,9 +10,9 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
......@@ -40,10 +40,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
......
builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
View file @ ff6b684a
......@@ -64,7 +64,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\perf\inproc_thr.cpp" />
......
builds/msvc/vs2013/libzmq/libzmq.props
View file @ ff6b684a
......@@ -20,11 +20,8 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<EnablePREfast>false</EnablePREfast>
<PreprocessorDefinitions>_CRT_SECURE_NO_WARNINGS;FD_SETSIZE=1024;ZMQ_USE_SELECT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(Option-openpgm)' == 'true'">ZMQ_HAVE_OPENPGM;%(PreprocessorDefinitions)</PreprocessorDefinitions>
......@@ -59,10 +56,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="OptionInfo" BeforeTargets="PrepareForBuild">
<Message Text="Option-openpgm : $(Option-openpgm)" Importance="high"/>
<Message Text="Option-sodium : $(Option-sodium)" Importance="high"/>
......@@ -73,4 +66,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
</Target>
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View file @ ff6b684a
......@@ -113,7 +113,7 @@
<ClInclude Include="..\..\..\..\src\pgm_sender.hpp" />
<ClInclude Include="..\..\..\..\src\pgm_socket.hpp" />
<ClInclude Include="..\..\..\..\src\pipe.hpp" />
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
<ClInclude Include="..\..\..\..\src\poll.hpp" />
<ClInclude Include="..\..\..\..\src\poller.hpp" />
<ClInclude Include="..\..\..\..\src\poller_base.hpp" />
......@@ -243,4 +243,4 @@
<ResourceCompile Include="..\..\resource.rc" />
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
</Project>
\ No newline at end of file
</Project>
builds/msvc/vs2013/libzmq/libzmq.vcxproj.filters
View file @ ff6b684a
......@@ -450,7 +450,7 @@
<ClInclude Include="..\..\..\..\src\poll.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\platform.hpp">
<ClInclude Include="..\..\platform.hpp">
<Filter>src\include</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\src\pipe.hpp">
......
builds/msvc/vs2013/local_lat/local_lat.props
View file @ ff6b684a
......@@ -10,9 +10,9 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
......@@ -40,10 +40,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
......
builds/msvc/vs2013/local_lat/local_lat.vcxproj
View file @ ff6b684a
......@@ -64,7 +64,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\perf\local_lat.cpp" />
......
builds/msvc/vs2013/local_thr/local_thr.props
View file @ ff6b684a
......@@ -10,9 +10,9 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
......@@ -40,10 +40,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
......
builds/msvc/vs2013/local_thr/local_thr.vcxproj
View file @ ff6b684a
......@@ -68,7 +68,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\perf\local_thr.cpp" />
......
builds/msvc/vs2013/remote_lat/remote_lat.props
View file @ ff6b684a
......@@ -10,9 +10,9 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
......@@ -40,10 +40,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
......
builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
View file @ ff6b684a
......@@ -68,7 +68,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\perf\remote_lat.cpp" />
......
builds/msvc/vs2013/remote_thr/remote_thr.props
View file @ ff6b684a
......@@ -10,9 +10,9 @@
<!-- Configuration -->
<ItemDefinitionGroup>
<PreBuildEvent>
<Command>xcopy /c /y $(BuildRoot)platform.hpp $(RepoRoot)src\</Command>
</PreBuildEvent>
<ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
</ClCompile>
<Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link>
......@@ -40,10 +40,6 @@
<!-- Messages -->
<Target Name="CustomInfo" BeforeTargets="PrepareForBuild">
<Message Text="Will copy $(BuildRoot)platform.hpp -&gt; $(RepoRoot)src\platform.hpp" Importance="high"/>
</Target>
<Target Name="LinkageInfo" BeforeTargets="PrepareForBuild">
<Message Text="Linkage-libzmq : $(Linkage-libzmq)" Importance="high"/>
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high"/>
......
builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
View file @ ff6b684a
......@@ -64,7 +64,7 @@
<Import Project="$(ProjectDir)$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\..\..\src\platform.hpp" />
<ClInclude Include="..\..\platform.hpp" />
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\perf\remote_thr.cpp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment