diff options
| author | Stefan Boberg <[email protected]> | 2025-10-24 19:32:01 +0200 |
|---|---|---|
| committer | GitHub Enterprise <[email protected]> | 2025-10-24 19:32:01 +0200 |
| commit | 4cba4eb3f122c7a1a49b629b1c0656d7f817f001 (patch) | |
| tree | e184821073167f6e81a75193efca91013d7b359b /thirdparty/cpr/nuget/build/native | |
| parent | fixed progress bar when scanning changed local files (#608) (diff) | |
| download | zen-4cba4eb3f122c7a1a49b629b1c0656d7f817f001.tar.xz zen-4cba4eb3f122c7a1a49b629b1c0656d7f817f001.zip | |
move cpr in-tree (#605)
* added cpr 1.10.5 in-tree to allow updates to vcpkg without breaking the build
* added asio 1.29.0 in-tree to remove one more vcpkg dependency
* bumped vcpkg to 2024.06.15 to address failure to build due to use of deprecated binaries in vcpkg (404 error: `https://mirror.msys2.org/mingw/mingw64/mingw-w64-x86_64-pkgconf-1~2.1.0-1-any.pkg.tar.zst` during build)
Diffstat (limited to 'thirdparty/cpr/nuget/build/native')
| -rw-r--r-- | thirdparty/cpr/nuget/build/native/libcpr.props | 26 | ||||
| -rw-r--r-- | thirdparty/cpr/nuget/build/native/libcpr.targets | 11 |
2 files changed, 37 insertions, 0 deletions
diff --git a/thirdparty/cpr/nuget/build/native/libcpr.props b/thirdparty/cpr/nuget/build/native/libcpr.props new file mode 100644 index 000000000..ea6c69547 --- /dev/null +++ b/thirdparty/cpr/nuget/build/native/libcpr.props @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" + ToolsVersion="15.0"> + <PropertyGroup> + <LibraryType Condition="'$(Configuration)'=='Debug'">mdd</LibraryType> + <LibraryType Condition="'$(Configuration)'=='Release'">md</LibraryType> + </PropertyGroup> + <ItemGroup> + <CprLibs Include="$(MSBuildThisFileDirectory)\$(Platform)\$(Configuration)\lib\*.lib" /> + </ItemGroup> + <ItemGroup> + <CprDlls Include="$(MSBuildThisFileDirectory)\$(Platform)\$(Configuration)\bin\*.dll" /> + <None Include="@(CprDlls)"> + <Link>%(RecursiveDir)%(FileName)%(Extension)</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + </ItemGroup> + <PropertyGroup> + <CprLibraries>@(CprLibs)</CprLibraries> + </PropertyGroup> + <ItemDefinitionGroup> + <Link> + <AdditionalDependencies>$(CprLibraries);%(AdditionalDependencies)</AdditionalDependencies> + </Link> + </ItemDefinitionGroup> +</Project>
\ No newline at end of file diff --git a/thirdparty/cpr/nuget/build/native/libcpr.targets b/thirdparty/cpr/nuget/build/native/libcpr.targets new file mode 100644 index 000000000..01248913f --- /dev/null +++ b/thirdparty/cpr/nuget/build/native/libcpr.targets @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Target Name="PlatformCheck" BeforeTargets="InjectReference" Condition="(('$(Platform)' != 'x86') AND ('$(Platform)' != 'x64')) AND ('$(Platform)' != 'Win32'))"> + <Error Text="$(MSBuildThisFileName) does not work correctly on this platform: '$(Platform)'. You need to specify platform x86, x64, or Win32." /> + </Target> + <ItemDefinitionGroup> + <ClCompile> + <AdditionalIncludeDirectories>$(MSBuildThisFileDirectory)\$(Platform)\$(Configuration)\include\;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> + </ClCompile> + </ItemDefinitionGroup> +</Project>
\ No newline at end of file |