ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/python3/0002-use-vcpkg-zlib.patch

   1 From 196555707236f4387875749f66620fb519166963 Mon Sep 17 00:00:00 2001
   2 From: Adam Johnson <AdamJohnso@gmail.com>
   3 Date: Wed, 9 Sep 2020 15:20:36 -0400
   4 Subject: [PATCH 2/6] use vcpkg zlib
   5
   6 building without zlib is not a supported configuration, per the warning
   7 messages.
   8 ---
   9  PCbuild/pythoncore.vcxproj | 6 ++++--
  10  1 file changed, 4 insertions(+), 2 deletions(-)
  11
  12 diff --git a/PCbuild/pythoncore.vcxproj b/PCbuild/pythoncore.vcxproj
  13 index dbe236829a..5f30a35eb3 100644
  14 --- a/PCbuild/pythoncore.vcxproj
  15 +++ b/PCbuild/pythoncore.vcxproj
  16 @@ -507,8 +507,10 @@
  17      <ClCompile Include="..\Python\thread.c" />
  18      <ClCompile Include="..\Python\traceback.c" />
  19    </ItemGroup>
  20 -  <ItemGroup Condition="$(IncludeExternals)">
  21 +  <ItemGroup>
  22      <ClCompile Include="..\Modules\zlibmodule.c" />
  23 +  </ItemGroup>
  24 +  <ItemGroup Condition="false">
  25      <ClCompile Include="$(zlibDir)\adler32.c" />
  26      <ClCompile Include="$(zlibDir)\compress.c" />
  27      <ClCompile Include="$(zlibDir)\crc32.c" />
  28 @@ -556,7 +558,7 @@
  29    <Target Name="_WarnAboutToolset" BeforeTargets="PrepareForBuild" Condition="$(PlatformToolset) != 'v140' and $(PlatformToolset) != 'v141' and $(PlatformToolset) != 'v142'">
  30      <Warning Text="Toolset $(PlatformToolset) is not used for official builds. Your build may have errors or incompatibilities." />
  31    </Target>
  32 -  <Target Name="_WarnAboutZlib" BeforeTargets="PrepareForBuild" Condition="!$(IncludeExternals)">
  33 +  <Target Name="_WarnAboutZlib" BeforeTargets="PrepareForBuild" Condition="false">
  34      <Warning Text="Not including zlib is not a supported configuration." />
  35    </Target>
  36
  37 --
  38 2.28.0.windows.1
  39