3party/libzmq
0
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-03-09 15:26:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use vs2015 MSBuild property sheets in older projects

Browse Source 
All the older (vs2010 -> vs2013) projects had copies of the Visual Studio 2015 MSBuild applied to them when running the 'configure.bat' batch file. Any modifications to a property sheet was not applied to the other Visual Studio versions' projects unless the batch file was re-executed.

* Modified the older projects to reference the Visual Studio 2015 property sheets so changes are immediately applied
* Removed the batch file copy steps (which left the repository very dirty after execution)
This commit is contained in:
Matt Powley 2016-03-31 14:43:47 +01:00
parent cddfda2aed
commit 0e405a5a77
22 changed files with 21 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
builds/msvc/configure.bat
View File

@ -27,31 +27,3 @@ IF EXIST "..\..\..\libsodium" (
ECHO. >> platform.hpp
ECHO #endif>> platform.hpp
:- Copy property files for test suite; these are the
:- same for all versions of VS so we maintain only the ones
:- in vs2015
COPY /Y vs2015\libzmq\libzmq.props vs2010\libzmq >nul
COPY /Y vs2015\inproc_lat\inproc_lat.props vs2010\inproc_lat >nul
COPY /Y vs2015\inproc_thr\inproc_thr.props vs2010\inproc_thr >nul
COPY /Y vs2015\local_lat\local_lat.props vs2010\local_lat >nul
COPY /Y vs2015\local_thr\local_thr.props vs2010\local_thr >nul
COPY /Y vs2015\remote_lat\remote_lat.props vs2010\remote_lat >nul
COPY /Y vs2015\remote_thr\remote_thr.props vs2010\remote_thr >nul
COPY /Y vs2015\libzmq\libzmq.props vs2012\libzmq >nul
COPY /Y vs2015\inproc_lat\inproc_lat.props vs2012\inproc_lat >nul
COPY /Y vs2015\inproc_thr\inproc_thr.props vs2012\inproc_thr >nul
COPY /Y vs2015\local_lat\local_lat.props vs2012\local_lat >nul
COPY /Y vs2015\local_thr\local_thr.props vs2012\local_thr >nul
COPY /Y vs2015\remote_lat\remote_lat.props vs2012\remote_lat >nul
COPY /Y vs2015\remote_thr\remote_thr.props vs2012\remote_thr >nul
COPY /Y vs2015\libzmq\libzmq.props vs2013\libzmq >nul
COPY /Y vs2015\inproc_lat\inproc_lat.props vs2013\inproc_lat >nul
COPY /Y vs2015\inproc_thr\inproc_thr.props vs2013\inproc_thr >nul
COPY /Y vs2015\local_lat\local_lat.props vs2013\local_lat >nul
COPY /Y vs2015\local_thr\local_thr.props vs2013\local_thr >nul
COPY /Y vs2015\remote_lat\remote_lat.props vs2013\remote_lat >nul
COPY /Y vs2015\remote_thr\remote_thr.props vs2013\remote_thr >nul

2
builds/msvc/vs2010/inproc_lat/inproc_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2010/inproc_thr/inproc_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2010/libzmq/libzmq.vcxproj
View File

@ -64,7 +64,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
<ClCompile>

2
builds/msvc/vs2010/local_lat/local_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2010/local_thr/local_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2010/remote_lat/remote_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2010/remote_thr/remote_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2012/inproc_lat/inproc_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2012/inproc_thr/inproc_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2012/libzmq/libzmq.vcxproj
View File

@ -64,7 +64,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
<ClCompile>

2
builds/msvc/vs2012/local_lat/local_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2012/local_thr/local_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2012/remote_lat/remote_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2012/remote_thr/remote_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2013/inproc_lat/inproc_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2013/inproc_thr/inproc_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2013/libzmq/libzmq.vcxproj
View File

@ -64,7 +64,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseLTCG|Win32'">
<ClCompile>

2
builds/msvc/vs2013/local_lat/local_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2013/local_thr/local_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2013/remote_lat/remote_lat.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />

2
builds/msvc/vs2013/remote_thr/remote_thr.vcxproj
View File

@ -61,7 +61,7 @@
<ImportGroup Label="PropertySheets">
<Import Project="$(ProjectDir)..\..\properties\$(Configuration).props" />
<Import Project="$(ProjectDir)..\..\properties\Output.props" />
<Import Project="$(ProjectDir)$(ProjectName).props" />
<Import Project="$(ProjectDir)..\..\vs2015\$(ProjectName)\$(ProjectName).props" />
</ImportGroup>
<ItemGroup>
<ClInclude Include="..\..\platform.hpp" />