ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/gmp/vs.build.patch

   1 diff --git a/SMP/smp.props b/SMP/smp.props
   2 index e2ed214..fc70bd8 100644
   3 --- a/SMP/smp.props
   4 +++ b/SMP/smp.props
   5 @@ -87,7 +87,7 @@
   6    <PropertyGroup Label="UserMacros" />
   7    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   8      <TargetName>lib$(RootNamespace)d</TargetName>
   9 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  10 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  11      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  12      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  13      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  14 @@ -95,7 +95,7 @@
  15    </PropertyGroup>
  16    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  17      <TargetName>lib$(RootNamespace)d</TargetName>
  18 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  19 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  20      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  21      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  22      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  23 @@ -103,7 +103,7 @@
  24    </PropertyGroup>
  25    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|Win32'">
  26      <TargetName>$(RootNamespace)d</TargetName>
  27 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  28 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  29      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  30      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  31      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  32 @@ -111,7 +111,7 @@
  33    </PropertyGroup>
  34    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLL|x64'">
  35      <TargetName>$(RootNamespace)d</TargetName>
  36 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  37 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  38      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  39      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  40      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  41 @@ -119,7 +119,7 @@
  42    </PropertyGroup>
  43    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  44      <TargetName>lib$(RootNamespace)</TargetName>
  45 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  46 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  47      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  48      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  49      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  50 @@ -127,7 +127,7 @@
  51    </PropertyGroup>
  52    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  53      <TargetName>lib$(RootNamespace)</TargetName>
  54 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  55 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  56      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  57      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  58      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  59 @@ -135,7 +135,7 @@
  60    </PropertyGroup>
  61    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|Win32'">
  62      <TargetName>$(RootNamespace)</TargetName>
  63 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  64 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  65      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  66      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  67      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  68 @@ -143,7 +143,7 @@
  69    </PropertyGroup>
  70    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLL|x64'">
  71      <TargetName>$(RootNamespace)</TargetName>
  72 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  73 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  74      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  75      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  76      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  77 diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
  78 index 9b453a5..cb5f090 100644
  79 --- a/SMP/smp_winrt.props
  80 +++ b/SMP/smp_winrt.props
  81 @@ -98,7 +98,7 @@
  82    <PropertyGroup Label="UserMacros" />
  83    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
  84      <TargetName>lib$(RootNamespace)d_winrt</TargetName>
  85 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  86 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  87      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  88      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  89      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  90 @@ -106,7 +106,7 @@
  91    </PropertyGroup>
  92    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
  93      <TargetName>lib$(RootNamespace)d_winrt</TargetName>
  94 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
  95 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
  96      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  97      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  98      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
  99 @@ -114,7 +114,7 @@
 100    </PropertyGroup>
 101    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
 102      <TargetName>$(RootNamespace)d_winrt</TargetName>
 103 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 104 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
 105      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 106      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 107      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
 108 @@ -122,7 +122,7 @@
 109    </PropertyGroup>
 110    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
 111      <TargetName>$(RootNamespace)d_winrt</TargetName>
 112 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 113 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
 114      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 115      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 116      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
 117 @@ -130,7 +130,7 @@
 118    </PropertyGroup>
 119    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
 120      <TargetName>lib$(RootNamespace)_winrt</TargetName>
 121 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 122 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
 123      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 124      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 125      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
 126 @@ -138,7 +138,7 @@
 127    </PropertyGroup>
 128    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
 129      <TargetName>lib$(RootNamespace)_winrt</TargetName>
 130 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 131 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
 132      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 133      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 134      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
 135 @@ -146,7 +146,7 @@
 136    </PropertyGroup>
 137    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
 138      <TargetName>$(RootNamespace)_winrt</TargetName>
 139 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 140 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
 141      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 142      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 143      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
 144 @@ -154,7 +154,7 @@
 145    </PropertyGroup>
 146    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
 147      <TargetName>$(RootNamespace)_winrt</TargetName>
 148 -    <OutDir>$(ProjectDir)..\..\..\msvc\</OutDir>
 149 +    <OutDir>$(ProjectDir)..\msvc\</OutDir>
 150      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 151      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 152      <CustomBuildAfterTargets>Clean</CustomBuildAfterTargets>
 153 diff --git a/gmp.pc.in b/gmp.pc.in
 154 index bf1c799..d0c81be 100644
 155 --- a/gmp.pc.in
 156 +++ b/gmp.pc.in
 157 @@ -8,4 +8,4 @@ Description: GNU Multiple Precision Arithmetic Library
 158  URL: https://gmplib.org
 159  Version: @PACKAGE_VERSION@
 160  Cflags: -I${includedir}
 161 -Libs: -L${libdir} -lgmp
 162 +Libs: -L${libdir} @LIBS@
 163 diff --git a/gmpxx.pc.in b/gmpxx.pc.in
 164 index 181cc70..2b697ce 100644
 165 --- a/gmpxx.pc.in
 166 +++ b/gmpxx.pc.in
 167 @@ -9,4 +9,4 @@ URL: https://gmplib.org
 168  Version: @PACKAGE_VERSION@
 169  Requires: gmp
 170  Cflags: -I${includedir}
 171 -Libs: -L${libdir} -lgmpxx
 172 +Libs: -L${libdir} @LIBS@