diff options
| author | Osyotr <Osyotr@users.noreply.github.com> | 2021-10-12 06:28:23 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-10-11 20:28:23 -0700 |
| commit | 9240fd0d8cc5ad7ed3663e58d99294a496f82854 (patch) | |
| tree | e9389aac8220837bc52836de3855526f49b425ad | |
| parent | ea4b8b17cdafc0ec470870b3c4c33055a5fa3273 (diff) | |
| download | vcpkg-9240fd0d8cc5ad7ed3663e58d99294a496f82854.tar.gz vcpkg-9240fd0d8cc5ad7ed3663e58d99294a496f82854.zip | |
[boost-gil] remove dependency boost-filesystem (#20575)
* [boost-gil] remove dependency boost-filesystem
This dependency is optional and only used to build and run tests and examples.
See https://github.com/boostorg/gil#requirements
However, there is also BOOST_GIL_IO_ADD_FS_PATH_SUPPORT which enables
boost::filesystem::path support for IO functions, but since users have to define
it manually, they must install the dependency manually, too.
* fix spacing
* fix generate-ports.ps1
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
| -rw-r--r-- | ports/boost-gil/vcpkg.json | 5 | ||||
| -rw-r--r-- | scripts/boost/generate-ports.ps1 | 7 | ||||
| -rw-r--r-- | versions/b-/boost-gil.json | 5 | ||||
| -rw-r--r-- | versions/baseline.json | 2 |
4 files changed, 14 insertions, 5 deletions
diff --git a/ports/boost-gil/vcpkg.json b/ports/boost-gil/vcpkg.json index 2f3d1c8e8..991dc51d6 100644 --- a/ports/boost-gil/vcpkg.json +++ b/ports/boost-gil/vcpkg.json @@ -1,6 +1,7 @@ { "name": "boost-gil", "version": "1.77.0", + "port-version": 1, "description": "Boost gil module", "homepage": "https://github.com/boostorg/gil", "dependencies": [ @@ -8,10 +9,6 @@ "boost-concept-check", "boost-config", "boost-core", - { - "name": "boost-filesystem", - "platform": "!uwp" - }, "boost-integer", "boost-iterator", "boost-mp11", diff --git a/scripts/boost/generate-ports.ps1 b/scripts/boost/generate-ports.ps1 index 902d86449..7a32a0a8c 100644 --- a/scripts/boost/generate-ports.ps1 +++ b/scripts/boost/generate-ports.ps1 @@ -26,6 +26,7 @@ $portVersions = @{ #e.g. "boost-asio" = 1;
"boost" = 1;
"boost-config" = 2;
+ "boost-gil" = 1;
"boost-iostreams" = 1;
"boost-modular-build-helper" = 1;
"boost-odeint" = 1;
@@ -508,6 +509,12 @@ foreach ($library in $libraries) { " [unknown] " + $($usedLibraries | Where-Object { $foundLibraries -notcontains $_ })
$deps = @($usedLibraries | Where-Object { $foundLibraries -contains $_ })
+ # break unnecessary dependencies
+ $deps = @($deps | ? {
+ -not (
+ ($library -eq 'gil' -and $_ -eq 'filesystem') # PR #20575
+ )
+ })
$deps = @($deps | ForEach-Object { GeneratePortDependency $_ })
$deps += @("boost-vcpkg-helpers")
diff --git a/versions/b-/boost-gil.json b/versions/b-/boost-gil.json index 4b38949a2..d81ef54fe 100644 --- a/versions/b-/boost-gil.json +++ b/versions/b-/boost-gil.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "d6607eb56e9f61771dbd6915d2e5d4b3b2976a7e", + "version": "1.77.0", + "port-version": 1 + }, + { "git-tree": "2f4d4429e10ce2721dc48a01588fbf200c683bc5", "version": "1.77.0", "port-version": 0 diff --git a/versions/baseline.json b/versions/baseline.json index c0f6c9ba3..f5a50b541 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -698,7 +698,7 @@ }, "boost-gil": { "baseline": "1.77.0", - "port-version": 0 + "port-version": 1 }, "boost-graph": { "baseline": "1.77.0", |