Skip to content

Commit

Permalink
update to boost 1.85.0
Browse files Browse the repository at this point in the history
  • Loading branch information
chcg committed Apr 28, 2024
1 parent c3d4228 commit 0faef87
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 15 deletions.
8 changes: 4 additions & 4 deletions PythonScript.Tests/PythonScript.Tests.vcxproj
Expand Up @@ -311,14 +311,14 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\packages\boost.1.84.0\build\boost.targets" Condition="Exists('..\packages\boost.1.84.0\build\boost.targets')" />
<Import Project="..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets" Condition="Exists('..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets')" />
<Import Project="..\packages\boost.1.85.0\build\boost.targets" Condition="Exists('..\packages\boost.1.85.0\build\boost.targets')" />
<Import Project="..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets" Condition="Exists('..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\packages\boost.1.84.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.84.0\build\boost.targets'))" />
<Error Condition="!Exists('..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets'))" />
<Error Condition="!Exists('..\packages\boost.1.85.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost.1.85.0\build\boost.targets'))" />
<Error Condition="!Exists('..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions PythonScript.Tests/packages.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.84.0" targetFramework="native" />
<package id="boost_python312-vc143" version="1.84.0" targetFramework="native" />
<package id="boost" version="1.85.0" targetFramework="native" />
<package id="boost_python312-vc143" version="1.85.0" targetFramework="native" />
</packages>
8 changes: 4 additions & 4 deletions PythonScript/project/PythonScript.vcxproj
Expand Up @@ -543,14 +543,14 @@ xcopy $(ProjectDir)..\python_tests\*.* "e:\notepadtest\unicode\plugins\config\py
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
<Import Project="..\..\packages\boost.1.84.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.84.0\build\boost.targets')" />
<Import Project="..\..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets" Condition="Exists('..\..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets')" />
<Import Project="..\..\packages\boost.1.85.0\build\boost.targets" Condition="Exists('..\..\packages\boost.1.85.0\build\boost.targets')" />
<Import Project="..\..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets" Condition="Exists('..\..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets')" />
</ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
</PropertyGroup>
<Error Condition="!Exists('..\..\packages\boost.1.84.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.84.0\build\boost.targets'))" />
<Error Condition="!Exists('..\..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost_python312-vc143.1.84.0\build\boost_python312-vc143.targets'))" />
<Error Condition="!Exists('..\..\packages\boost.1.85.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost.1.85.0\build\boost.targets'))" />
<Error Condition="!Exists('..\..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\boost_python312-vc143.1.85.0\build\boost_python312-vc143.targets'))" />
</Target>
</Project>
4 changes: 2 additions & 2 deletions PythonScript/project/packages.config
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.84.0" targetFramework="native" />
<package id="boost_python312-vc143" version="1.84.0" targetFramework="native" />
<package id="boost" version="1.85.0" targetFramework="native" />
<package id="boost_python312-vc143" version="1.85.0" targetFramework="native" />
<package id="python" version="3.12.3" targetFramework="native" />
<package id="pythonx86" version="3.12.3" targetFramework="native" />
</packages>
4 changes: 2 additions & 2 deletions PythonScript/project/packages_local_pydebug.config
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="boost" version="1.84.0" targetFramework="native" />
<package id="boost_python312-vc143" version="1.84.0" targetFramework="native" />
<package id="boost" version="1.85.0" targetFramework="native" />
<package id="boost_python312-vc143" version="1.85.0" targetFramework="native" />
</packages>
2 changes: 1 addition & 1 deletion appveyor.yml
Expand Up @@ -13,7 +13,7 @@ platform:
configuration:
- Release
- Debug
# see https://www.boost.org/doc/libs/1_84_0/libs/python/doc/html/building/python_debugging_builds.html
# see https://www.boost.org/doc/libs/1_85_0/libs/python/doc/html/building/python_debugging_builds.html
# not available by boost nuget package
#- PythonDebug

Expand Down

0 comments on commit 0faef87

Please sign in to comment.