diff options
| author | Thomas Bracht Laumann Jespersen <t@laumann.xyz> | 2022-08-07 16:42:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-07 16:42:01 +0200 |
| commit | c7bccf0515892617af984328e96cff5b4a6cd6d3 (patch) | |
| tree | 67fe67826f15c36e97cc6b8edf150e0b4e68fee5 /wrapping/java | |
| parent | e3f07dcc07c651321ec3b5f540ef698bbe6f1906 (diff) | |
CMake: switch to GNUInstallDirs (#1424)
* Add GNUInstallDirs for standard installation directories
Distributions are given standard variables for already existing hooks.
Multiarch libdirs is taken care of automagically.
Raises minimum cmake version by a little.
* Handle CMAKE_INSTALL_xxx being absolute paths for .pc file generation
In some cases the CMAKE_INSTAL_{BIN,MAN,DOC,LIB,INCLUDE}DIR variables
may turn out to be absolute paths in which case prepending ${prefix} in
the pkg-config .pc files will result in incorrect values.
For .pc file generation, figure out if these variables are absolute and
omit the prefix in the configured file when so.
See: https://github.com/OSGeo/PROJ/commit/ab25e4b7ed9544e668282dcd293cfaaa2e56dbdf
Diffstat (limited to 'wrapping/java')
| -rw-r--r-- | wrapping/java/openjp2/CMakeLists.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/wrapping/java/openjp2/CMakeLists.txt b/wrapping/java/openjp2/CMakeLists.txt index 6a9ebc20..b178d2cf 100644 --- a/wrapping/java/openjp2/CMakeLists.txt +++ b/wrapping/java/openjp2/CMakeLists.txt @@ -66,5 +66,5 @@ add_custom_target(OpenJPEGJavaJar ALL ) install(FILES ${LIBRARY_OUTPUT_PATH}/openjpeg.jar - DESTINATION ${OPENJPEG_INSTALL_SHARE_DIR} COMPONENT JavaModule + DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} COMPONENT JavaModule ) |