From 26cdc3866f521191521f972cd7ea58152f82e931 Mon Sep 17 00:00:00 2001 From: Marcel Koch Date: Wed, 17 Apr 2024 07:03:38 +0000 Subject: [PATCH 1/2] use DESTDIR when installing pkg config --- cmake/generate_pkg.cmake.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cmake/generate_pkg.cmake.in b/cmake/generate_pkg.cmake.in index c03dee1d00b..bb7f0236bfc 100644 --- a/cmake/generate_pkg.cmake.in +++ b/cmake/generate_pkg.cmake.in @@ -12,13 +12,16 @@ string(REPLACE " " "\ " GINKGO_PKG_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") string(REPLACE ";" "\ " GINKGO_INTERFACE_LINK_FLAGS "@GINKGO_INTERFACE_LINK_FLAGS@") string(REPLACE ";" "\ " GINKGO_INTERFACE_CXX_FLAGS "@GINKGO_INTERFACE_CXX_FLAGS@") +# @TODO: better to use file(REAL_PATH ...) with cmake 3.19+ +get_filename_component(GINKGO_PKG_INSTALL_PREFIX ${GINKGO_PKG_INSTALL_PREFIX} ABSOLUTE) + set(GINKGO_INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@") set(GINKGO_INSTALL_INCLUDEDIR "@CMAKE_INSTALL_INCLUDEDIR@") set(GINKGO_PROJECT_NAME "@CMAKE_PROJECT_NAME@") set(GINKGO_DESCRIPTION "@Ginkgo_DESCRIPTION@") set(GINKGO_VERSION "@Ginkgo_VERSION@") -set(GINKGO_INSTALL_PKGCONFIG_DIR "${GINKGO_PKG_INSTALL_PREFIX}/${GINKGO_INSTALL_LIBDIR}/pkgconfig") +set(GINKGO_INSTALL_PKGCONFIG_DIR "$ENV{DESTDIR}${GINKGO_PKG_INSTALL_PREFIX}/${GINKGO_INSTALL_LIBDIR}/pkgconfig") set(GINKGO_SOURCE_DIR "@Ginkgo_SOURCE_DIR@") set(GINKGO_BINARY_DIR "@Ginkgo_BINARY_DIR@") From ee681f58e1eb88af588cf8cfd153263322e15604 Mon Sep 17 00:00:00 2001 From: Marcel Koch Date: Wed, 17 Apr 2024 07:04:12 +0000 Subject: [PATCH 2/2] deduce pkg prefix from config file directory --- cmake/ginkgo.pc.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/ginkgo.pc.in b/cmake/ginkgo.pc.in index cbcd89cb274..8254fa6b79b 100644 --- a/cmake/ginkgo.pc.in +++ b/cmake/ginkgo.pc.in @@ -1,4 +1,4 @@ -prefix=@GINKGO_PKG_INSTALL_PREFIX@ +prefix=${pcfiledir}/../.. libdir=${prefix}/@GINKGO_INSTALL_LIBDIR@ includedir=${prefix}/@GINKGO_INSTALL_INCLUDEDIR@