Skip to content

L
libzmq
Commit 01ab149b authored by evoskuil's avatar evoskuil
Browse files
Options

Problem: copy of libsodium import props is unnecessary.

parent 7425fcca
Hide whitespace changes
Inline Side-by-side
Showing with 71 additions and 68 deletions
builds/msvc/build/buildbase.bat
View file @ 01ab149b
...@@ -16,49 +16,39 @@ SET environment="%programfiles(x86)%\%tools%" ...@@ -16,49 +16,39 @@ SET environment="%programfiles(x86)%\%tools%"
IF NOT EXIST %environment% SET environment="%programfiles%\%tools%" IF NOT EXIST %environment% SET environment="%programfiles%\%tools%"
IF NOT EXIST %environment% GOTO no_tools IF NOT EXIST %environment% GOTO no_tools
SET packages= @ECHO %ACTION% %solution%
IF EXIST "..\..\..\..\libsodium\builds/msvc/vs2015\libsodium.import.props" (
COPY /Y "..\..\..\..\libsodium\builds/msvc/vs2015\libsodium.import.props" . > %log%
IF errorlevel 1 GOTO error
SET packages=%packages% /p:HAVE_LIBSODIUM=1
) ELSE (
ECHO %ACTION% without libsodium
)
@ECHO %ACTION% %solution%... (%packages%)
CALL %environment% x86 >%SystemDrive%\nul 2>&1 CALL %environment% x86 >%SystemDrive%\nul 2>&1
ECHO Platform=x86 2> %log% ECHO Platform=x86 2> %log%
ECHO Configuration=DynDebug ECHO Configuration=DynDebug
msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
ECHO Configuration=DynRelease ECHO Configuration=DynRelease
msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
ECHO Configuration=LtcgDebug ECHO Configuration=LtcgDebug
msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
ECHO Configuration=LtcgRelease ECHO Configuration=LtcgRelease
msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
ECHO Configuration=StaticDebug ECHO Configuration=StaticDebug
msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
ECHO Configuration=StaticRelease ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=Win32 %solution% %target%>> %log% || GOTO error
CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1 CALL %environment% x86_amd64 >%SystemDrive%\nul 2>&1
ECHO Platform=x64 ECHO Platform=x64
ECHO Configuration=DynDebug ECHO Configuration=DynDebug
msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=DynDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
ECHO Configuration=DynRelease ECHO Configuration=DynRelease
msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=DynRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
ECHO Configuration=LtcgDebug ECHO Configuration=LtcgDebug
msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=LtcgDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
ECHO Configuration=LtcgRelease ECHO Configuration=LtcgRelease
msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=LtcgRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
ECHO Configuration=StaticDebug ECHO Configuration=StaticDebug
msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=StaticDebug /p:Platform=x64 %solution% %target%>> %log% || GOTO error
ECHO Configuration=StaticRelease ECHO Configuration=StaticRelease
msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %packages% %solution% %target%>> %log% || GOTO error msbuild /m /v:n /p:Configuration=StaticRelease /p:Platform=x64 %solution% %target%>> %log% || GOTO error
ECHO %ACTION% complete: %solution% ECHO %ACTION% complete: %solution%
GOTO end GOTO end
......
builds/msvc/vs2015/inproc_lat/inproc_lat.props
View file @ 01ab149b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
...@@ -15,16 +15,17 @@ ...@@ -15,16 +15,17 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="..\libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>dynamic</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'" >dynamic</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'" >dynamic</Linkage-libsodium>
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq> <Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
...@@ -45,4 +46,4 @@ ...@@ -45,4 +46,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/> <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
</Target> </Target>
</Project> </Project>
\ No newline at end of file
builds/msvc/vs2015/inproc_thr/inproc_thr.props
View file @ 01ab149b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
...@@ -15,14 +15,15 @@ ...@@ -15,14 +15,15 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="..\libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq> <Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
...@@ -45,4 +46,4 @@ ...@@ -45,4 +46,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/> <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
</Target> </Target>
</Project> </Project>
\ No newline at end of file
builds/msvc/vs2015/libzmq.import.props
View file @ 01ab149b
...@@ -4,13 +4,13 @@ ...@@ -4,13 +4,13 @@
<PropertyGroup Label="Globals"> <PropertyGroup Label="Globals">
<_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName> <_PropertySheetDisplayName>ZMQ Import Settings</_PropertySheetDisplayName>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)libzmq.import.xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
<PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions Condition="'$(Option-gssapi)' == 'true'">HAVE_LIBGSSAPI_KRB5;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile> </ClCompile>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Linkage --> <!-- Linkage -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories> <AdditionalLibraryDirectories Condition="$(Configuration.IndexOf('Release')) != -1">$(ProjectDir)..\..\..\..\..\libzmq\bin\$(PlatformName)\Release\$(PlatformToolset)\$(Linkage-libzmq)\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Copy --> <!-- Copy -->
<Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'"> <Target Name="Linkage-libzmq-dynamic" AfterTargets="AfterBuild" Condition="'$(Linkage-libzmq)' == 'dynamic'">
...@@ -58,4 +58,4 @@ ...@@ -58,4 +58,4 @@
<Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" /> <Message Text="Copying libzmq.pdb -&gt; $(TargetDir)libzmq.pdb" Importance="high" Condition="$(Configuration.IndexOf('Debug')) != -1" />
</Target> </Target>
</Project> </Project>
\ No newline at end of file
builds/msvc/vs2015/libzmq/libzmq.props
View file @ 01ab149b
...@@ -6,15 +6,15 @@ ...@@ -6,15 +6,15 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- User Interface --> <!-- User Interface -->
<ItemGroup Label="BuildOptionsExtension"> <ItemGroup Label="BuildOptionsExtension">
<PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" /> <PropertyPageSchema Include="$(MSBuildThisFileDirectory)$(ProjectName).xml" />
</ItemGroup> </ItemGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
<ClCompile> <ClCompile>
<AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>$(ProjectDir)..\..\;$(ProjectDir)..\..\..\..\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
...@@ -36,9 +36,10 @@ ...@@ -36,9 +36,10 @@
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">dynamic</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">dynamic</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
...@@ -60,4 +61,4 @@ ...@@ -60,4 +61,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/> <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
</Target> </Target>
</Project> </Project>
\ No newline at end of file
builds/msvc/vs2015/local_lat/local_lat.props
View file @ 01ab149b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
...@@ -15,14 +15,15 @@ ...@@ -15,14 +15,15 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="..\libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq> <Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
...@@ -45,4 +46,4 @@ ...@@ -45,4 +46,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/> <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
</Target> </Target>
</Project> </Project>
\ No newline at end of file
builds/msvc/vs2015/local_thr/local_thr.props
View file @ 01ab149b
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet> <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<RunCodeAnalysis>false</RunCodeAnalysis> <RunCodeAnalysis>false</RunCodeAnalysis>
</PropertyGroup> </PropertyGroup>
<!-- Configuration --> <!-- Configuration -->
<ItemDefinitionGroup> <ItemDefinitionGroup>
...@@ -15,14 +15,15 @@ ...@@ -15,14 +15,15 @@
</ClCompile> </ClCompile>
<Link> <Link>
<AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies> <AdditionalDependencies>Advapi32.lib;Rpcrt4.lib;Ws2_32.lib;Iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
</Link> </Link>
</ItemDefinitionGroup> </ItemDefinitionGroup>
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="..\libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq> <Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
...@@ -45,4 +46,4 @@ ...@@ -45,4 +46,4 @@
<Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/> <Message Text="Linkage-libsodium : $(Linkage-libsodium)" Importance="high" Condition="'$(HAVE_LIBSODIUM)'=='1'"/>
</Target> </Target>
</Project> </Project>
\ No newline at end of file
builds/msvc/vs2015/remote_lat/remote_lat.props
View file @ 01ab149b
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="..\libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>dynamic</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">dynamic</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">dynamic</Linkage-libsodium>
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq> <Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
builds/msvc/vs2015/remote_thr/remote_thr.props
View file @ 01ab149b
...@@ -21,10 +21,11 @@ ...@@ -21,10 +21,11 @@
<!-- Dependencies --> <!-- Dependencies -->
<ImportGroup Label="PropertySheets"> <ImportGroup Label="PropertySheets">
<Import Project="$(SolutionDir)libzmq.import.props" /> <Import Project="..\libzmq.import.props" />
<Import Project="$(SolutionDir)libsodium.import.props" Condition="'$(HAVE_LIBSODIUM)'=='1'" /> <Import Project="$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props"
Condition="Exists('$(MSBuildThisFileDirectory)..\..\..\..\..\libsodium\builds\msvc\vs2015\libsodium.import.props')" />
</ImportGroup> </ImportGroup>
<PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'dynamic'">
<Linkage-libzmq>dynamic</Linkage-libzmq> <Linkage-libzmq>dynamic</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">dynamic</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">dynamic</Linkage-libsodium>
...@@ -36,7 +37,7 @@ ...@@ -36,7 +37,7 @@
<PropertyGroup Condition="'$(DefaultLinkage)' == 'static'"> <PropertyGroup Condition="'$(DefaultLinkage)' == 'static'">
<Linkage-libzmq>static</Linkage-libzmq> <Linkage-libzmq>static</Linkage-libzmq>
<Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium> <Linkage-libsodium Condition="'$(HAVE_LIBSODIUM)'=='1'">static</Linkage-libsodium>
</PropertyGroup> </PropertyGroup>
<!-- Messages --> <!-- Messages -->
......
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