aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorJonathan Hale <Squareys@googlemail.com>2021-02-18 22:02:27 +0100
committerGitHub <noreply@github.com>2021-02-18 13:02:27 -0800
commite7377f7992830bfc60fb2a7f43f300200822d82a (patch)
tree3511109456949c2a1ab60176d9e27dc061a58b15 /versions
parentaef2f37056fa9481f2783bf47d18f8705dbff19a (diff)
downloadvcpkg-e7377f7992830bfc60fb2a7f43f300200822d82a.tar.gz
vcpkg-e7377f7992830bfc60fb2a7f43f300200822d82a.zip
[magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (#16245)
* [magnum] Correctly deploy shaderconverter and sceneconverter plugins Signed-off-by: Squareys <squareys@googlemail.com> * [magnum,-plugins] Only remove plugin lib dirs for Windows platforms Signed-off-by: Squareys <squareys@googlemail.com> * [magnum,-plugins] Clean up deletion of plugin libs and clarify in comment Signed-off-by: Squareys <squareys@googlemail.com> * Update versions Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/m-/magnum-plugins.json5
-rw-r--r--versions/m-/magnum.json5
3 files changed, 12 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 39df75880..16b8a0f37 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -3674,7 +3674,7 @@
},
"magnum": {
"baseline": "2020.06",
- "port-version": 3
+ "port-version": 4
},
"magnum-extras": {
"baseline": "2020.06",
@@ -3686,7 +3686,7 @@
},
"magnum-plugins": {
"baseline": "2020.06",
- "port-version": 2
+ "port-version": 3
},
"mapbox-variant": {
"baseline": "1.2.0",
diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json
index 0913d3788..3ab660883 100644
--- a/versions/m-/magnum-plugins.json
+++ b/versions/m-/magnum-plugins.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "79988d3cd16038434cacef0e4423f3b2e64f0a1b",
+ "version-string": "2020.06",
+ "port-version": 3
+ },
+ {
"git-tree": "b9b701869c5d4f5f4203702622d2bbfa58b6517f",
"version-string": "2020.06",
"port-version": 2
diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json
index 171c91661..d2cdf0bb6 100644
--- a/versions/m-/magnum.json
+++ b/versions/m-/magnum.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "96fbedbdb7cac5cb1624af746d6e4b2cb4b57cc8",
+ "version-string": "2020.06",
+ "port-version": 4
+ },
+ {
"git-tree": "84fd6db3cf53cfcb736bfb14b08b86940f5588e1",
"version-string": "2020.06",
"port-version": 3