Skip to content

[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (#16904)#576

Merged
Jimmy-Hu merged 1 commit intoJimmy-Hu:masterfrom
microsoft:master
Mar 28, 2021
Merged

[vcpkg baseline][osgearth/gdal] Re-fix dependency gdal (#16904)#576
Jimmy-Hu merged 1 commit intoJimmy-Hu:masterfrom
microsoft:master

Conversation

@Jimmy-Hu
Copy link
Owner

Merge from microsoft/vcpkg

* [osgearth] Re-fix dependency gdal

* [gdal] Add dependency freexl on UNIX

* update version record

* fix patch

* convert to manifest

* update version record

* re-fix

* update version record

* add dependency freexl

* update version record

* Disable freexl

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Don't require freexl on Windows

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Revert osgearth change

* Fix the baseline version

* Fix osgearth baseline version

* [protouf] Automatic set protobuf_MODULE_COMPATIBLE to include the module file

* Set protobuf_MODULE_COMPATIBLE in wrapper

* Re-fix protobuf

* update version record

Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
@Jimmy-Hu Jimmy-Hu merged commit 805124c into Jimmy-Hu:master Mar 28, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants