diff options
| author | Even Rouault <even.rouault@spatialys.com> | 2020-02-11 18:50:53 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 18:50:53 +0100 |
| commit | 595aafef26bc7878cb4d708cb682e4944e5f7fbb (patch) | |
| tree | c862cb9d4206f3be8bc11b9f28855abe43cff018 /docs/source | |
| parent | a10b5edfad805b1e09d88b31b953707412440b09 (diff) | |
| parent | 29583196dfae2565a35c7a8759cc8a5640d6a2b1 (diff) | |
| download | PROJ-595aafef26bc7878cb4d708cb682e4944e5f7fbb.tar.gz PROJ-595aafef26bc7878cb4d708cb682e4944e5f7fbb.zip | |
Merge pull request #1921 from rouault/pj_get_relative_share_proj
Use relative directory to locate PROJ resource files.
Diffstat (limited to 'docs/source')
| -rw-r--r-- | docs/source/resource_files.rst | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/docs/source/resource_files.rst b/docs/source/resource_files.rst index 28628d30..48120982 100644 --- a/docs/source/resource_files.rst +++ b/docs/source/resource_files.rst @@ -23,8 +23,8 @@ PROJ will attempt to locate its resource files - database, transformation grids or init-files - from several directories. The following paths are checked in order: -- For transformation grids that have an explict relative or absolute path, - the directory specified in the grid filename. +- For resource files that have an explict relative or absolute path, + the directory specified in the filename. - Path resolved by the callback function set with the :c:func:`proj_context_set_file_finder`. If it is set, the next tests @@ -35,7 +35,9 @@ The following paths are checked in order: .. _user_writable_directory: -- The PROJ user writable directory, which is : +- .. versionadded:: 7.0 + + The PROJ user writable directory, which is : * on Windows, ${LOCALAPPDATA}/proj * on MacOSX, ${HOME}/Library/Application Support/proj @@ -45,13 +47,16 @@ The following paths are checked in order: - Path(s) set with by the environment variable :envvar:`PROJ_LIB`. On Linux/MacOSX/Unix, use ``:`` to separate paths. On Windows, ``;`` -- On Windows, the *..\\share\\proj\\* and its contents are found automatically +- .. versionadded:: 7.0 + + The *../share/proj/* and its contents are found automatically at run-time if the installation respects the build structure. That is, the - binaries and proj.dll are installed under *..\\bin\\*, and resource files - are in *..\\share\\proj\\*. + binaries and proj.dll/libproj.so are installed under *../bin/* or *../lib/*, + and resource files are in *../share/proj/*. - A path built into PROJ as its resource installation directory (whose value is - $(pkgdatadir)), for builds using the Makefile build system. Note, however, + $(pkgdatadir) for builds using the Makefile build system or + ${CMAKE_INSTALL_PREFIX}/${DATADIR} for CMake builds). Note, however, that since this is a hard-wired path setting, it only works if the whole PROJ installation is not moved somewhere else. |