Skip to content

Commit

Permalink
[boost-ublas] Remove dependency on boost-compute (#29325)
Browse files Browse the repository at this point in the history
  • Loading branch information
sweemer committed Jul 26, 2023
1 parent 4160b0c commit fa9d1fa
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 6 deletions.
6 changes: 1 addition & 5 deletions ports/boost-ublas/vcpkg.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,11 @@
"$comment": "Automatically generated by scripts/boost/generate-ports.ps1",
"name": "boost-ublas",
"version": "1.82.0",
"port-version": 2,
"port-version": 3,
"description": "Boost ublas module",
"homepage": "https://github.com/boostorg/ublas",
"license": "BSL-1.0",
"dependencies": [
{
"name": "boost-compute",
"version>=": "1.82.0"
},
{
"name": "boost-concept-check",
"version>=": "1.82.0"
Expand Down
2 changes: 2 additions & 0 deletions scripts/boost/generate-ports.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ $defaultPortVersion = 2
$portVersions = @{
"boost-atomic" = 3;
"boost-modular-build-helper" = 4;
"boost-ublas" = 3;
}

function Get-PortVersion {
Expand Down Expand Up @@ -580,6 +581,7 @@ foreach ($library in $libraries) {
# break unnecessary dependencies
$deps = @($deps | ? {
-not (
($library -eq 'ublas' -and $_ -eq 'compute') -or # PR #29325
($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575
)
})
Expand Down
5 changes: 5 additions & 0 deletions versions/b-/boost-ublas.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "08ca3e3e8708563241aa02fdb7d6c6e406ae30e6",
"version": "1.82.0",
"port-version": 3
},
{
"git-tree": "c0dd4493fe63a58cd9fdec0d48b9855a09ecbdd2",
"version": "1.82.0",
Expand Down
2 changes: 1 addition & 1 deletion versions/baseline.json
Original file line number Diff line number Diff line change
Expand Up @@ -1198,7 +1198,7 @@
},
"boost-ublas": {
"baseline": "1.82.0",
"port-version": 2
"port-version": 3
},
"boost-uninstall": {
"baseline": "1.82.0",
Expand Down

0 comments on commit fa9d1fa

Please sign in to comment.