Replace PROJ_DATA_PATH with ${CMAKE_INSTALL_DATADIR}/proj - #4843
Merged
mwtoews merged 1 commit intoSep 7, 2026
Conversation
rouault
approved these changes
Sep 7, 2026
Member
|
@mwtoews are you happy with this PR as is? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This replaces the CMake variable
PROJ_DATA_PATHfrom an absolute path (e.g./usr/local/share/proj) to a relative path${CMAKE_INSTALL_DATADIR}/proj(e.g.share/proj).This is because
install(FILES <file> ... [...])expects thatDESTINATION <dir>is a relative path, and CMake 4.4 and later will show a warning for this with-Wauthor. Furthermore, "it is strongly recommended that [packages] use a path that begins with the appropriate relative GNUInstallDirs variable", as done in this PR. I believe this allows the prefix to be adjusted at install time (which is not fully supported in this project, yet.)When
EMBED_PROJ_DATA_PATH=ONis used (default), the absolute path is stored for thePROJ_DATAdefine (not sure what happens at install time with this one).The primary change in this PR was suggested in #3742 which @rouault was "not a big fan of" at the time.
Also, related to #4730