commit: 3af4933852ab0021e667db087ca55911f1f75382 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Tue Mar 22 02:13:30 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Tue Mar 22 02:13:43 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3af49338
sci-libs/libgeotiff: update CMake patch Signed-off-by: Sam James <sam <AT> gentoo.org> .../files/libgeotiff-1.7.1-gnuinstalldirs.patch | 24 +++++++++++++++++++++- ...iff-1.7.1.ebuild => libgeotiff-1.7.1-r1.ebuild} | 0 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch index 47ee7050aa8a..6fdcd9753f95 100644 --- a/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch +++ b/sci-libs/libgeotiff/files/libgeotiff-1.7.1-gnuinstalldirs.patch @@ -1,6 +1,6 @@ https://github.com/OSGeo/libgeotiff/pull/74 -From 8541a109f3aad4756488f730ed8d71060f9b282f Mon Sep 17 00:00:00 2001 +From d18deccb461990c826ceee8fbcc57a44502ace2e Mon Sep 17 00:00:00 2001 From: Sam James <[email protected]> Date: Sun, 20 Mar 2022 02:55:50 +0000 Subject: [PATCH] CMake: adopt GNUInstallDirs @@ -13,7 +13,15 @@ This works cross-platform still but it means libgeotiff uses the standard options which CMake projects tend to use for such locations and therefore no special treatment is needed when packaging it. +Fixes: https://github.com/OSGeo/issues/33 Signed-off-by: Sam James <[email protected]> +--- + CMakeLists.txt | 41 ++++++++++------------------------- + bin/CMakeLists.txt | 6 ++--- + 2 files changed, 14 insertions(+), 33 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 001df67..1840258 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -7,6 +7,8 @@ @@ -96,3 +104,17 @@ Signed-off-by: Sam James <[email protected]> # Define grouping of source files in PROJECT file (e.g. Visual Studio) SOURCE_GROUP("CMake Files" FILES CMakeLists.txt) +diff --git a/bin/CMakeLists.txt b/bin/CMakeLists.txt +index dad465f..c61585c 100644 +--- a/bin/CMakeLists.txt ++++ b/bin/CMakeLists.txt +@@ -41,6 +41,6 @@ MESSAGE(STATUS "Adding GeoTIFF utilities to build - done: ${GEOTIFF_UTILITIES}") + # Targets installation + + INSTALL(TARGETS ${GEOTIFF_UTILITIES} +- RUNTIME DESTINATION ${GEOTIFF_BIN_DIR} +- LIBRARY DESTINATION ${GEOTIFF_LIB_DIR} +- ARCHIVE DESTINATION ${GEOTIFF_LIB_DIR}) ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) diff --git a/sci-libs/libgeotiff/libgeotiff-1.7.1.ebuild b/sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild similarity index 100% rename from sci-libs/libgeotiff/libgeotiff-1.7.1.ebuild rename to sci-libs/libgeotiff/libgeotiff-1.7.1-r1.ebuild
