aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorJonathan Hale <Squareys@googlemail.com>2021-09-02 22:24:33 +0200
committerGitHub <noreply@github.com>2021-09-02 13:24:33 -0700
commit8655bfd4b311df8dd853ca49969a9ecfac94ea91 (patch)
tree094312d9e50a82e7c7bce576aa13779936239995 /versions
parenta35b42633c56923608a4f7222d4aa7b996015bf2 (diff)
downloadvcpkg-8655bfd4b311df8dd853ca49969a9ecfac94ea91.tar.gz
vcpkg-8655bfd4b311df8dd853ca49969a9ecfac94ea91.zip
[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435)
* [magnum/-plugins] Remove obsolete patches that no longer apply Signed-off-by: Squareys <squareys@googlemail.com> * [corrade] Make feature to flag translation consistent to fix warning Consistent with magnum & magnum-plugins Signed-off-by: Squareys <squareys@googlemail.com> * Fix warning message for dlls without matching pdbs always displayed Signed-off-by: Squareys <squareys@googlemail.com> * Fix the baseline version * Revert the changes in vcpkg_copy_pdbs.cmake Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json6
-rw-r--r--versions/c-/corrade.json5
-rw-r--r--versions/m-/magnum-plugins.json5
-rw-r--r--versions/m-/magnum.json5
4 files changed, 18 insertions, 3 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 9bd4e2e4c..44f2f5921 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1406,7 +1406,7 @@
},
"corrade": {
"baseline": "2020.06",
- "port-version": 1
+ "port-version": 2
},
"cpp-base64": {
"baseline": "V2.rc.08",
@@ -3966,7 +3966,7 @@
},
"magnum": {
"baseline": "2020.06",
- "port-version": 5
+ "port-version": 6
},
"magnum-extras": {
"baseline": "2020.06",
@@ -3978,7 +3978,7 @@
},
"magnum-plugins": {
"baseline": "2020.06",
- "port-version": 5
+ "port-version": 6
},
"mailio": {
"baseline": "0.20.0",
diff --git a/versions/c-/corrade.json b/versions/c-/corrade.json
index e0f2e29f7..08452c733 100644
--- a/versions/c-/corrade.json
+++ b/versions/c-/corrade.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "ec9f53411152ed98e9d591afed7e34e65fb7abeb",
+ "version-string": "2020.06",
+ "port-version": 2
+ },
+ {
"git-tree": "12cd1f62edbe4e05de794c862facfdfd0fe8171d",
"version-string": "2020.06",
"port-version": 1
diff --git a/versions/m-/magnum-plugins.json b/versions/m-/magnum-plugins.json
index 84b2d06f1..c506406ff 100644
--- a/versions/m-/magnum-plugins.json
+++ b/versions/m-/magnum-plugins.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "3aedbba0e9e694651549ff34fba8d6eeeb3fdde6",
+ "version-string": "2020.06",
+ "port-version": 6
+ },
+ {
"git-tree": "457d2fb07dd06abe61d8bdee77bc5dc1ff9391a5",
"version-string": "2020.06",
"port-version": 5
diff --git a/versions/m-/magnum.json b/versions/m-/magnum.json
index 6103787d6..006dae3e1 100644
--- a/versions/m-/magnum.json
+++ b/versions/m-/magnum.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "f420e42c1b841b4f3b2f2cda488a35f68b0677d7",
+ "version-string": "2020.06",
+ "port-version": 6
+ },
+ {
"git-tree": "cb97c301133d04f205cb1547e5559341474f842e",
"version-string": "2020.06",
"port-version": 5