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

Use relative directory to locate PROJ resource files. #1921

Merged
merged 1 commit into from Feb 11, 2020

Conversation

rouault
Copy link
Member

@rouault rouault commented Feb 9, 2020

Fixes #1490

This is an extension of the Window-specific logic added recently to
Unix builds. This reuses parts of proposed past commit
82a07e5
(credits to @abellgithub)

hobu
hobu approved these changes Feb 9, 2020
@rouault rouault force-pushed the pj_get_relative_share_proj branch from 5aa0eda to 872fc89 Compare Feb 9, 2020
@rouault rouault added this to the 7.0.0 milestone Feb 9, 2020
@kbevers
Copy link
Member

@kbevers kbevers commented Feb 11, 2020

@rouault merging #1920 causes conflicts here. Do you mind fixing those?

Fixes OSGeo#1490

This is an extension of the Window-specific logic added recently to
Unix builds. This reuses parts of proposed past commit
OSGeo@82a07e5
(credits to @abellgithub)
@rouault rouault force-pushed the pj_get_relative_share_proj branch from 872fc89 to 2958319 Compare Feb 11, 2020
@rouault
Copy link
Member Author

@rouault rouault commented Feb 11, 2020

Do you mind fixing those?

Done

@kbevers
Copy link
Member

@kbevers kbevers commented Feb 11, 2020

Done

Thank you!

@rouault rouault merged commit 595aafe into OSGeo:master Feb 11, 2020
3 of 4 checks passed
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.

3 participants