Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[gdal] Update to 3.1.3 #13449

Merged
merged 31 commits into from Nov 20, 2020
Merged

[gdal] Update to 3.1.3 #13449

merged 31 commits into from Nov 20, 2020

Conversation

JackBoosY
Copy link
Contributor

@JackBoosY JackBoosY commented Sep 10, 2020

This PR is partially inherited from #9100, will make the following changes:

  1. Add option INSTALL_COMMAND to vcpkg_build_nmake and vcpkg_install_nmake
  2. Add option MAKEFILE to vcpkg_build_make
  3. Update gdal to 3.1.3
  4. Switch execute_process to vcpkg_install_nmake on Windows.
  5. Switch execute_process to vcpkg_configure_make/vcpkg_install_make on *inx.

Note: Because part of the dependencies in *inx has a missing relationship on the master, this PR does not deal with this and will be dealt with in other PRs.

Fixes #11905 #8664.

@JackBoosY JackBoosY added category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist info:internal This PR or Issue was filed by the vcpkg team. category:port-update The issue is with a library, which is requesting update new revision labels Sep 10, 2020
@JackBoosY
Copy link
Contributor Author

Needs to merge #10408 first(requires libgeotiff 1.6.0).

@JackBoosY JackBoosY added depends:different-pr This PR or Issue depends on a PR which has been filed category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly labels Sep 10, 2020
@JackBoosY JackBoosY removed the depends:different-pr This PR or Issue depends on a PR which has been filed label Oct 14, 2020
@JackBoosY JackBoosY marked this pull request as ready for review October 15, 2020 11:21
@JackBoosY
Copy link
Contributor Author

cc @Neumann-A for review this PR.

ports/gdal/usage Outdated Show resolved Hide resolved
@JackBoosY JackBoosY linked an issue Nov 5, 2020 that may be closed by this pull request
# Conflicts:
#	scripts/cmake/vcpkg_build_make.cmake
@JackBoosY
Copy link
Contributor Author

@strega-nil @BillyONeal Anything else?

@strega-nil
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@JackBoosY
Copy link
Contributor Author

@strega-nil Can we merge this PR now?

@JackBoosY JackBoosY linked an issue Nov 20, 2020 that may be closed by this pull request
@strega-nil strega-nil merged commit fdfe770 into microsoft:master Nov 20, 2020
@JackBoosY JackBoosY deleted the dev/jack/11905 branch November 23, 2020 05:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
category:port-feature The issue is with a library, which is requesting new capabilities that didn’t exist category:port-update The issue is with a library, which is requesting update new revision category:tool-update The issue is with build tool or build script, which requires update or should be executed correctly info:internal This PR or Issue was filed by the vcpkg team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

cannot linking GDAL compiled from vcpkg GDAL update to 3.1.0 How do I link GDAL to library compile
7 participants