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

Proposed by Gerry Boland
Status: Needs review
Proposed branch: lp:~gerboland/bamf-qt/pkgconfig-fix
Merge into: lp:bamf-qt
Diff against target: 41 lines (+11/-6)
2 files modified
CMakeLists.txt (+8/-3)
libqtbamf.pc.in (+3/-3)
To merge this branch: bzr merge lp:~gerboland/bamf-qt/pkgconfig-fix
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
unity-2d-team Pending
Review via email: mp+91552@code.launchpad.net

Description of the change

Generate pkgconfig file by cmake so it points to install directories

To post a comment you must log in.
Michal Hruby (mhr3) wrote :

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

review: Approve
Unity Merger (unity-merger) wrote :

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 updated
396. By Gerry Boland on 2012-02-20

Generate .pc file into bild directory, fix dpkg generation

Michal Hruby (mhr3) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2011-12-14 12:29:14 +0000
3+++ CMakeLists.txt 2012-02-20 16:52:51 +0000
4@@ -130,9 +130,14 @@
5 DESTINATION ${INCLUDE_INSTALL_DIR}
6 )
7
8-# FIXME: Generate from ${CMAKE_INSTALL_PREFIX}
9-install(FILES libqtbamf.pc
10- DESTINATION lib/pkgconfig
11+# PkgConfig file
12+set (PREFIX "${CMAKE_INSTALL_PREFIX}")
13+set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
14+
15+configure_file (libqtbamf.pc.in
16+ ${CMAKE_CURRENT_BINARY_DIR}/libqtbamf.pc @ONLY)
17+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libqtbamf.pc
18+ DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
19 )
20
21 ## QtBamfQml
22
23=== renamed file 'libqtbamf.pc' => 'libqtbamf.pc.in'
24--- libqtbamf.pc 2011-01-13 17:57:36 +0000
25+++ libqtbamf.pc.in 2012-02-20 16:52:51 +0000
26@@ -1,5 +1,5 @@
27-prefix=/usr
28-exec_prefix=/usr
29+prefix=@PREFIX@
30+exec_prefix=@EXEC_PREFIX@
31 libdir=${exec_prefix}/lib
32 includedir=${prefix}/include
33
34@@ -7,6 +7,6 @@
35 Description: Qt binding and QML plugin for the bamf d-bus server.
36 Version: 0.0
37
38-Requires: QtDBus
39+Requires: QtDBus libbamf3
40 Libs: -L${libdir} -lQtBamf
41 Cflags: -I${includedir}/QtBamf

Subscribers

People subscribed via source and target branches

to all changes: