diff options
| author | Alexander Neumann <30894796+Neumann-A@users.noreply.github.com> | 2021-04-06 19:53:41 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-04-06 10:53:41 -0700 |
| commit | 1bb0fe61dfecd1450a1ff44c7fc8d424365366aa (patch) | |
| tree | 7e99db8c737c022a6e19392ec0a6f98504a38069 /versions | |
| parent | 030cfaa24de9ea1bbf0a4d9c615ce7312ba77af1 (diff) | |
| download | vcpkg-1bb0fe61dfecd1450a1ff44c7fc8d424365366aa.tar.gz vcpkg-1bb0fe61dfecd1450a1ff44c7fc8d424365366aa.zip | |
[vcpkg baseline][qt5-base] Fix glib link issues on linux (#16954)
* [qt5-base] fix glib link issues on linux
* add version
* remove unused vars
* update version
* write port info file.
* version stuff
* remove paraview from baseline. It was added due to the same spurious glib failures.
* trying out a different approach
* more changes
* change the if to actually use the buildtype instead
* remove x_vcpkg_get_port_info
* add option QT_OPENSSL_LINK back in
* use INCLUDE_DIRS_(DEBUG|RELEASE) instead of just INCLUDE_DIRS
* regen docs
* remove function call I forgot to remove
* [vcpkg-pkgconfig-get-modules] Move to port
* revert changes to ports.cmake
* include the file in qt5-base
* fix path
* remove unnecessary include
* Apply suggestions from code review
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Apply suggestions from code review
* update version
* ws removal
* version stuff
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Diffstat (limited to 'versions')
| -rw-r--r-- | versions/baseline.json | 6 | ||||
| -rw-r--r-- | versions/q-/qt5-base.json | 5 | ||||
| -rw-r--r-- | versions/v-/vcpkg-pkgconfig-get-modules.json | 9 |
3 files changed, 19 insertions, 1 deletions
diff --git a/versions/baseline.json b/versions/baseline.json index 7ba361f3b..eefd125a7 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4962,7 +4962,7 @@ }, "qt5-base": { "baseline": "5.15.2", - "port-version": 3 + "port-version": 4 }, "qt5-canvas3d": { "baseline": "0", @@ -6264,6 +6264,10 @@ "baseline": "3", "port-version": 0 }, + "vcpkg-pkgconfig-get-modules": { + "baseline": "2021-04-02", + "port-version": 0 + }, "vectorclass": { "baseline": "2.00.01", "port-version": 0 diff --git a/versions/q-/qt5-base.json b/versions/q-/qt5-base.json index 4fbe36d47..8b437940a 100644 --- a/versions/q-/qt5-base.json +++ b/versions/q-/qt5-base.json @@ -1,6 +1,11 @@ { "versions": [ { + "git-tree": "6bd06b14752f1123c7d43df59ae19c584c24ea54", + "version-string": "5.15.2", + "port-version": 4 + }, + { "git-tree": "da84dcfb306668b2cdb510efb6a130882da2055a", "version-string": "5.15.2", "port-version": 3 diff --git a/versions/v-/vcpkg-pkgconfig-get-modules.json b/versions/v-/vcpkg-pkgconfig-get-modules.json new file mode 100644 index 000000000..c1c65a541 --- /dev/null +++ b/versions/v-/vcpkg-pkgconfig-get-modules.json @@ -0,0 +1,9 @@ +{ + "versions": [ + { + "git-tree": "827541895526ebcd68711de9d05e98acd09bd323", + "version-date": "2021-04-02", + "port-version": 0 + } + ] +} |