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

   1 diff --git a/SMP/smp.props b/SMP/smp.props
   2 index fc70bd8..d515523 100644
   3 --- a/SMP/smp.props
   4 +++ b/SMP/smp.props
   5 @@ -86,7 +86,7 @@
   6    </ImportGroup>
   7    <PropertyGroup Label="UserMacros" />
   8    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
   9 -    <TargetName>lib$(RootNamespace)d</TargetName>
  10 +    <TargetName>$(RootNamespace)d</TargetName>
  11      <OutDir>$(ProjectDir)..\msvc\</OutDir>
  12      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  13      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  14 @@ -94,7 +94,7 @@
  15      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  16    </PropertyGroup>
  17    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
  18 -    <TargetName>lib$(RootNamespace)d</TargetName>
  19 +    <TargetName>$(RootNamespace)d</TargetName>
  20      <OutDir>$(ProjectDir)..\msvc\</OutDir>
  21      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  22      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  23 @@ -118,7 +118,7 @@
  24      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  25    </PropertyGroup>
  26    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
  27 -    <TargetName>lib$(RootNamespace)</TargetName>
  28 +    <TargetName>$(RootNamespace)</TargetName>
  29      <OutDir>$(ProjectDir)..\msvc\</OutDir>
  30      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  31      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  32 @@ -126,7 +126,7 @@
  33      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
  34    </PropertyGroup>
  35    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
  36 -    <TargetName>lib$(RootNamespace)</TargetName>
  37 +    <TargetName>$(RootNamespace)</TargetName>
  38      <OutDir>$(ProjectDir)..\msvc\</OutDir>
  39      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
  40      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
  41 @@ -159,6 +159,7 @@
  42        <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
  43        <MinimalRebuild>false</MinimalRebuild>
  44        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  45 +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  46      </ClCompile>
  47      <Lib>
  48        <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
  49 @@ -177,6 +178,7 @@
  50        <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
  51        <MinimalRebuild>false</MinimalRebuild>
  52        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  53 +      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
  54      </ClCompile>
  55      <Lib>
  56        <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
  57 @@ -196,6 +198,7 @@
  58        <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
  59        <MinimalRebuild>false</MinimalRebuild>
  60        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  61 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  62      </ClCompile>
  63      <Link>
  64        <OutputFile>$(OutDir)\bin\x86\$(TargetName)$(TargetExt)</OutputFile>
  65 @@ -219,6 +222,7 @@
  66        <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
  67        <MinimalRebuild>false</MinimalRebuild>
  68        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  69 +      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
  70      </ClCompile>
  71      <Link>
  72        <OutputFile>$(OutDir)\bin\x64\$(TargetName)$(TargetExt)</OutputFile>
  73 @@ -248,6 +252,7 @@
  74        <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
  75        <ProgramDataBaseFileName>$(OutDir)\lib\x86\$(TargetName).pdb</ProgramDataBaseFileName>
  76        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  77 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  78      </ClCompile>
  79      <Lib>
  80        <OutputFile>$(OutDir)\lib\x86\$(TargetName)$(TargetExt)</OutputFile>
  81 @@ -273,6 +278,7 @@
  82        <InterproceduralOptimization>SingleFile</InterproceduralOptimization>
  83        <ProgramDataBaseFileName>$(OutDir)\lib\x64\$(TargetName).pdb</ProgramDataBaseFileName>
  84        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  85 +      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
  86      </ClCompile>
  87      <Lib>
  88        <OutputFile>$(OutDir)\lib\x64\$(TargetName)$(TargetExt)</OutputFile>
  89 @@ -297,6 +303,7 @@
  90        <AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  91        <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
  92        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
  93 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
  94      </ClCompile>
  95      <Link>
  96        <EnableCOMDATFolding>true</EnableCOMDATFolding>
  97 @@ -328,6 +335,7 @@
  98        <AdditionalIncludeDirectories>$(OutDir)\include;$(ProjectDir)\..\..\prebuilt\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
  99        <ProgramDataBaseFileName>$(IntDir)$(TargetName).pdb</ProgramDataBaseFileName>
 100        <TreatSpecificWarningsAsErrors>4113;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
 101 +      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 102      </ClCompile>
 103      <Link>
 104        <EnableCOMDATFolding>true</EnableCOMDATFolding>
 105 diff --git a/SMP/smp_winrt.props b/SMP/smp_winrt.props
 106 index cb5f090..19b2b8d 100644
 107 --- a/SMP/smp_winrt.props
 108 +++ b/SMP/smp_winrt.props
 109 @@ -97,7 +97,7 @@
 110    </ImportGroup>
 111    <PropertyGroup Label="UserMacros" />
 112    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|Win32'">
 113 -    <TargetName>lib$(RootNamespace)d_winrt</TargetName>
 114 +    <TargetName>l$(RootNamespace)d</TargetName>
 115      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 116      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 117      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 118 @@ -105,7 +105,7 @@
 119      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 120    </PropertyGroup>
 121    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugWinRT|x64'">
 122 -    <TargetName>lib$(RootNamespace)d_winrt</TargetName>
 123 +    <TargetName>$(RootNamespace)d</TargetName>
 124      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 125      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 126      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 127 @@ -113,7 +113,7 @@
 128      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 129    </PropertyGroup>
 130    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|Win32'">
 131 -    <TargetName>$(RootNamespace)d_winrt</TargetName>
 132 +    <TargetName>$(RootNamespace)d</TargetName>
 133      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 134      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 135      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 136 @@ -121,7 +121,7 @@
 137      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 138    </PropertyGroup>
 139    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DebugDLLWinRT|x64'">
 140 -    <TargetName>$(RootNamespace)d_winrt</TargetName>
 141 +    <TargetName>$(RootNamespace)d</TargetName>
 142      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 143      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 144      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 145 @@ -129,7 +129,7 @@
 146      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 147    </PropertyGroup>
 148    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|Win32'">
 149 -    <TargetName>lib$(RootNamespace)_winrt</TargetName>
 150 +    <TargetName>$(RootNamespace)</TargetName>
 151      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 152      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 153      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 154 @@ -137,7 +137,7 @@
 155      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 156    </PropertyGroup>
 157    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseWinRT|x64'">
 158 -    <TargetName>lib$(RootNamespace)_winrt</TargetName>
 159 +    <TargetName>$(RootNamespace)</TargetName>
 160      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 161      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 162      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 163 @@ -145,7 +145,7 @@
 164      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 165    </PropertyGroup>
 166    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|Win32'">
 167 -    <TargetName>$(RootNamespace)_winrt</TargetName>
 168 +    <TargetName>$(RootNamespace)</TargetName>
 169      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 170      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 171      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>
 172 @@ -153,7 +153,7 @@
 173      <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
 174    </PropertyGroup>
 175    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='ReleaseDLLWinRT|x64'">
 176 -    <TargetName>$(RootNamespace)_winrt</TargetName>
 177 +    <TargetName>$(RootNamespace)</TargetName>
 178      <OutDir>$(ProjectDir)..\msvc\</OutDir>
 179      <IntDir>$(ProjectDir)obj\$(Configuration)\$(Platform)\$(ProjectName)\</IntDir>
 180      <GeneratedFilesDir>$(ProjectDir)obj\Generated</GeneratedFilesDir>