aboutsummaryrefslogtreecommitdiff
path: root/versions
diff options
context:
space:
mode:
authorankurverma85 <31362771+ankurverma85@users.noreply.github.com>2021-03-25 13:28:42 -0700
committerGitHub <noreply@github.com>2021-03-25 13:28:42 -0700
commit5a10163c44526b5d42a67480ce7a692a36948761 (patch)
treec62543931827cad6fddf592e41b05a162cdd075e /versions
parentc2e1d32c25c77a258e103e00d778f6d935b44e73 (diff)
downloadvcpkg-5a10163c44526b5d42a67480ce7a692a36948761.tar.gz
vcpkg-5a10163c44526b5d42a67480ce7a692a36948761.zip
[osgearth] Fix x64-windows-static-md (#15375)
* osgearth:x64-windows-static-md fixes * Try to build for x64-windows-static-md * Fix builds * Indent and combine blocks * overwrite version * merge with master and update version * revert incorrect version changes * [osgearth] Improve portfile.cmake, add feature tools * update version record * disable fontconfig on windows * update version * [osgearth] Fix dependencies * [osgearth] Re-fix dependencies * [osgearth] Fix the sequence of linking osg * [osgearth] Fix dependency osg * update version record * Fix osgearth:x64-linux * x64-windows-static-md fixes * Fix x64-linux * Build fixes * Update x-add-version Co-authored-by: ankurv <ankurv@microsoft.com> Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Diffstat (limited to 'versions')
-rw-r--r--versions/baseline.json4
-rw-r--r--versions/o-/osg.json5
-rw-r--r--versions/o-/osgearth.json5
3 files changed, 12 insertions, 2 deletions
diff --git a/versions/baseline.json b/versions/baseline.json
index 4411252b3..fee501f25 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4494,7 +4494,7 @@
},
"osg": {
"baseline": "3.6.5",
- "port-version": 6
+ "port-version": 7
},
"osg-qt": {
"baseline": "Qt4",
@@ -4502,7 +4502,7 @@
},
"osgearth": {
"baseline": "3.1",
- "port-version": 2
+ "port-version": 3
},
"osi": {
"baseline": "0.108.6",
diff --git a/versions/o-/osg.json b/versions/o-/osg.json
index 973c0de20..3a40b3ef9 100644
--- a/versions/o-/osg.json
+++ b/versions/o-/osg.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "41c640888000654e84d2bf227b42973cc1ba15c9",
+ "version-string": "3.6.5",
+ "port-version": 7
+ },
+ {
"git-tree": "9b787269fae66af2447354c4e76ce0883c8d93b9",
"version-string": "3.6.5",
"port-version": 6
diff --git a/versions/o-/osgearth.json b/versions/o-/osgearth.json
index 674e0b0ab..c074ed279 100644
--- a/versions/o-/osgearth.json
+++ b/versions/o-/osgearth.json
@@ -1,6 +1,11 @@
{
"versions": [
{
+ "git-tree": "d2483eb1bb083bdcf0b4de24f0f8c0d77825dc56",
+ "version": "3.1",
+ "port-version": 3
+ },
+ {
"git-tree": "9355b8ad52fcf4998fe4c262f29a4e01fa83b9fa",
"version": "3.1",
"port-version": 2