From ed1d246c2913d2d9993d440637c970e6f845a24a Mon Sep 17 00:00:00 2001
From: Andrew Stitcher <astitcher@apache.org>
Date: Thu, 10 Nov 2011 22:14:40 +0000
Subject: QPID-3607: pkg config for qmf2 library - Added new qmf2.pc file and
 make install logic for it

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@1200597 13f79535-47bb-0310-9956-ffa450edef68
---
 cpp/src/CMakeLists.txt | 7 +++++++
 cpp/src/Makefile.am    | 3 ++-
 cpp/src/qmf.mk         | 2 ++
 3 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'cpp/src')

diff --git a/cpp/src/CMakeLists.txt b/cpp/src/CMakeLists.txt
index 100f7dfe60..deae682647 100644
--- a/cpp/src/CMakeLists.txt
+++ b/cpp/src/CMakeLists.txt
@@ -1364,5 +1364,12 @@ if (UNIX)
   install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qpid.pc
            DESTINATION ${QPID_INSTALL_LIBDIR}/pkgconfig
            COMPONENT ${QPID_COMPONENT_COMMON})
+
+  add_dependencies(pkgconfig ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc)
+  configure_file(${CMAKE_CURRENT_SOURCE_DIR}/qmf2.pc.in
+                 ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc)
+  install (FILES ${CMAKE_CURRENT_BINARY_DIR}/qmf2.pc
+           DESTINATION ${QPID_INSTALL_LIBDIR}/pkgconfig
+           COMPONENT ${QPID_COMPONENT_COMMON})
 endif (UNIX)
 
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 1448a8a52f..91c787502d 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -69,6 +69,7 @@ EXTRA_DIST= $(platform_dist) $(rgen_srcs) $(windows_dist)
 # Define variables that are be appended to by this file and included .mk files.
 nobase_include_HEADERS =
 libqpidcommon_la_SOURCES =
+pkgconfig_DATA =
 
 ## Generated code
 
@@ -900,4 +901,4 @@ install-data-local:
 
 # Support for pkg-config
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = qpid.pc
+pkgconfig_DATA += qpid.pc
diff --git a/cpp/src/qmf.mk b/cpp/src/qmf.mk
index 3b6583bfaf..95d3d5c9b0 100644
--- a/cpp/src/qmf.mk
+++ b/cpp/src/qmf.mk
@@ -172,3 +172,5 @@ QMFENGINE_VERSION_INFO  = 1:1:0
 libqmf_la_LDFLAGS = -version-info $(QMF_VERSION_INFO)
 libqmf2_la_LDFLAGS = -version-info $(QMF2_VERSION_INFO)
 libqmfengine_la_LDFLAGS = -version-info $(QMFENGINE_VERSION_INFO)
+
+pkgconfig_DATA += qmf2.pc
-- 
cgit v1.2.1