From e042ce9eb11bf3bc63d7eb75d6deb9b3c8e328e6 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 28 Jun 2012 10:39:04 -0500 Subject: [PATCH] improve pkgconfig support (add a few more vars) --- lensfun-0.2.6-cmake_pkgconfig.patch | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/lensfun-0.2.6-cmake_pkgconfig.patch b/lensfun-0.2.6-cmake_pkgconfig.patch index 4e4f7f4..db2920e 100644 --- a/lensfun-0.2.6-cmake_pkgconfig.patch +++ b/lensfun-0.2.6-cmake_pkgconfig.patch @@ -1,7 +1,7 @@ diff -up lensfun-0.2.6/libs/lensfun/CMakeLists.txt.cmake_pkgconfig lensfun-0.2.6/libs/lensfun/CMakeLists.txt --- lensfun-0.2.6/libs/lensfun/CMakeLists.txt.cmake_pkgconfig 2012-02-12 05:19:39.000000000 -0600 -+++ lensfun-0.2.6/libs/lensfun/CMakeLists.txt 2012-06-28 09:27:52.891959669 -0500 -@@ -26,3 +26,8 @@ INSTALL(TARGETS lensfun ++++ lensfun-0.2.6/libs/lensfun/CMakeLists.txt 2012-06-28 10:05:08.767440482 -0500 +@@ -26,3 +26,8 @@ INSTALL(TARGETS lensfun RUNTIME DESTINATION ${BINDIR} LIBRARY DESTINATION ${LIBDIR} ARCHIVE DESTINATION ${LIBDIR}) @@ -11,12 +11,19 @@ diff -up lensfun-0.2.6/libs/lensfun/CMakeLists.txt.cmake_pkgconfig lensfun-0.2.6 +INSTALL( FILES ${CMAKE_CURRENT_BINARY_DIR}/lensfun.pc DESTINATION ${LIBDIR}/pkgconfig ) + diff -up lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake.cmake_pkgconfig lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake ---- lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake.cmake_pkgconfig 2012-06-28 09:30:08.819551879 -0500 -+++ lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake 2012-06-28 09:29:05.323538151 -0500 -@@ -0,0 +1,6 @@ +--- lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake.cmake_pkgconfig 2012-06-28 10:05:08.767440482 -0500 ++++ lensfun-0.2.6/libs/lensfun/lensfun.pc.cmake 2012-06-28 10:37:50.337917472 -0500 +@@ -0,0 +1,13 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++bindir=@CMAKE_INSTALL_PREFIX@/@BINDIR@ ++libdir=@CMAKE_INSTALL_PREFIX@/@LIBDIR@ ++includedir=@CMAKE_INSTALL_PREFIX@/@INCLUDEDIR@ ++datadir=@CMAKE_INSTALL_PREFIX@/@DATADIR@ ++docdir=@CMAKE_INSTALL_PREFIX@/@DOCDIR@ ++ +Name: lensfun +Description: A photographic lens database and access library +Version: @VERSION_MAJOR@.@VERSION_MINOR@.@VERSION_MICRO@.@VERSION_BUGFIX@ +Requires.private: glib-2.0 -+Libs: -L@CMAKE_INSTALL_PREFIX@/@LIBDIR@ -llensfun -+Cflags: -I@CMAKE_INSTALL_PREFIX@/@INCLUDEDIR@ ++Libs: -L${libdir} -llensfun ++Cflags: -I${includedir}