Exclude network ssl sources when ssl id disabled in .props ui.

Author: evoskuil

props/version4/import/libbitcoin-network.import.props

@@ -28,7 +28,9 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
+      <!-- Prevent boost from seeing ssl includes when ssl is deselected  (requires external headers). -->
+      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(ProjectDir)..\..\..\..\..\libbitcoin-network\include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <PreprocessorDefinitions Condition="'$(Linkage-libbitcoin-network)' == 'static' Or '$(Linkage-libbitcoin-network)' == 'ltcg'">BCT_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <PreprocessorDefinitions Condition="'$(Option-ssl)' == 'true'">WOLFSSL_USER_SETTINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -47,4 +49,14 @@
       </AdditionalLibraryDirectories>
     </Link>
   </ItemDefinitionGroup>
+
+  <Target Name="WolfSSLSuppressions" BeforeTargets="ClCompile">
+    <ItemGroup>
+      <ClCompile Update="@(ClCompile)">
+        <!-- Exclude wolfssl test sources when ssl is deselected (requires external linkage). -->
+        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\')) And '$(Option-ssl)' == 'false'">true</ExcludedFromBuild>
+      </ClCompile>
+    </ItemGroup>
+  </Target>
+  
 </Project>

props/version4/project/libbitcoin-network/libbitcoin-network-test/libbitcoin-network-test.props

@@ -13,14 +13,16 @@
     <ClCompile>
       <AdditionalIncludeDirectories>$(ProjectDir)..\..\..\..\..\libbitcoin-network\test\ssl\wolfssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <EnablePREfast>false</EnablePREfast>
-      <PreprocessorDefinitions>CERT_PREFIX=&quot;$(RepoRoot.Replace("\", "/"))test/ssl/vectors/&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+
+      <!-- Define CERT_PREFIX as the relative path to the /certs and /tests parent directory. -->
+      <PreprocessorDefinitions Condition="'$(Option-ssl)' == 'true'">CERT_PREFIX=&quot;$(RepoRoot.Replace("\", "/"))test/ssl/vectors/&quot;;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ClCompile>
     <PostBuildEvent Condition="'$(DebugOrRelease)' == 'release'">
       <Command>"$(TargetPath)" --log_level=warning --run_test=* --show_progress=no --build_info=yes</Command>
     </PostBuildEvent>
   </ItemDefinitionGroup>
 
-  <Target Name="SuppressWarningsForWolfSSLFiles" BeforeTargets="ClCompile">
+  <Target Name="WolfSSLSuppressions" BeforeTargets="ClCompile">
     <ItemGroup>
       <ClCompile Update="@(ClCompile)">
         <AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\test\ssl\wolfssl\'))">/wd4005 /wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>

props/version4/project/libbitcoin-network/libbitcoin-network/libbitcoin-network.props

@@ -24,7 +24,9 @@
   <ItemDefinitionGroup>
     <ClCompile>
       <AdditionalIncludeDirectories>$(RepoRoot)include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <AdditionalIncludeDirectories>$(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+
+      <!-- Prevent boost from seeing ssl includes when ssl is deselected  (requires external headers). -->
+      <AdditionalIncludeDirectories Condition="'$(Option-ssl)' == 'true'">$(RepoRoot)include\bitcoin\ssl\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <AdditionalOptions>/bigobj %(AdditionalOptions)</AdditionalOptions>
       <EnablePREfast>false</EnablePREfast>
       <PreprocessorDefinitions Condition="'$(ConfigurationType)' == 'DynamicLibrary'">BCT_DLL;%(PreprocessorDefinitions)</PreprocessorDefinitions>
@@ -33,10 +35,16 @@
     </ClCompile>
   </ItemDefinitionGroup>
 
-  <Target Name="SuppressWarningsForWolfSSLFiles" BeforeTargets="ClCompile">
+  <Target Name="WolfSSLSuppressions" BeforeTargets="ClCompile">
     <ItemGroup>
       <ClCompile Update="@(ClCompile)">
         <AdditionalOptions Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\src\ssl\'))">/wd4189 /wd4245 /wd4267 /wd4701 /wd4702 /wd4703 %(AdditionalOptions)</AdditionalOptions>
+        
+        <!-- This is only used as an inlining header, so never compile it directly. -->
+        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\ssl\'))">true</ExcludedFromBuild>
+        
+        <!-- Exclude wolfssl sources when ssl is deselected (requires external linkage). -->
+        <ExcludedFromBuild Condition="$([System.String]::new('%(RelativeDir)').StartsWith('..\..\..\..\include\bitcoin\ssl\wolfcrypt\src\')) And '$(Option-ssl)' == 'false'">true</ExcludedFromBuild>
       </ClCompile>
     </ItemGroup>
   </Target>