Merge lp:~gerboland/bamf-qt/pkgconfig-fix into lp:bamf-qt

[Gerry Boland]

Generate pkgconfig file by cmake so it points to install directories

[Michal Hruby (mhr3)]

Yey, I could have saved myself 10 minutes if I saw this earlier...

review: Approve

[Unity Merger (unity-merger)]

The Jenkins job https://jenkins.qa.ubuntu.com/job/automerge-bamf-qt/6/console reported an error when processing this lp:~gerboland/bamf-qt/pkgconfig-fix branch.
Not merging it.

[lp:~gerboland/bamf-qt/pkgconfig-fix]

396. By Gerry Boland on 2012-02-20

Generate .pc file into bild directory, fix dpkg generation

[Michal Hruby (mhr3)]

On the one!

review: Approve

Unmerged revisions

396. By Gerry Boland on 2012-02-20

Generate .pc file into bild directory, fix dpkg generation

395. By Gerry Boland on 2012-02-04

Generate pkgconfig file by cmake so it points to install directories

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2011-12-14 12:29:14 +0000
+++ CMakeLists.txt	2012-02-20 16:52:51 +0000
@@ -130,9 +130,14 @@
     DESTINATION ${INCLUDE_INSTALL_DIR}
     )
 
-# FIXME: Generate from ${CMAKE_INSTALL_PREFIX}
-install(FILES libqtbamf.pc
-    DESTINATION lib/pkgconfig
+# PkgConfig file
+set (PREFIX "${CMAKE_INSTALL_PREFIX}")
+set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
+
+configure_file (libqtbamf.pc.in
+    ${CMAKE_CURRENT_BINARY_DIR}/libqtbamf.pc @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libqtbamf.pc
+    DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
     )
 
 ## QtBamfQml
 
=== renamed file 'libqtbamf.pc' => 'libqtbamf.pc.in'
--- libqtbamf.pc	2011-01-13 17:57:36 +0000
+++ libqtbamf.pc.in	2012-02-20 16:52:51 +0000
@@ -1,5 +1,5 @@
-prefix=/usr
-exec_prefix=/usr
+prefix=@PREFIX@
+exec_prefix=@EXEC_PREFIX@
 libdir=${exec_prefix}/lib
 includedir=${prefix}/include
 
@@ -7,6 +7,6 @@
 Description: Qt binding and QML plugin for the bamf d-bus server.
 Version: 0.0
 
-Requires: QtDBus
+Requires: QtDBus libbamf3
 Libs: -L${libdir} -lQtBamf
 Cflags: -I${includedir}/QtBamf