Merge lp:~gerboland/dee-qt/pkgconfig-fix into lp:dee-qt/0.2

Proposed by Gerry Boland
Status: Merged
Approved by: Florian Boucault
Approved revision: 62
Merged at revision: 65
Proposed branch: lp:~gerboland/dee-qt/pkgconfig-fix
Merge into: lp:dee-qt/0.2
Diff against target: 41 lines (+12/-5)
2 files modified
CMakeLists.txt (+9/-2)
libqtdee.pc.in (+3/-3)
To merge this branch: bzr merge lp:~gerboland/dee-qt/pkgconfig-fix
Reviewer Review Type Date Requested Status
Michal Hruby (community) Approve
unity-2d-team Pending
Review via email: mp+91551@code.launchpad.net

Description of the change

Generate pkgconfig file by cmake to point to correct install directories

To post a comment you must log in.
Revision history for this message
Michal Hruby (mhr3) wrote :

Yey!

review: Approve
Revision history for this message
Unity Merger (unity-merger) wrote :

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

lp:~gerboland/dee-qt/pkgconfig-fix updated
62. By Gerry Boland

Add correct prefixes to .pc file. Fix dpkg generation

Revision history for this message
Michal Hruby (mhr3) wrote :

Yep, now it actually works. :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2012-01-05 20:27:31 +0000
+++ CMakeLists.txt 2012-02-20 16:35:21 +0000
@@ -94,8 +94,15 @@
94 DESTINATION ${INCLUDE_INSTALL_DIR}94 DESTINATION ${INCLUDE_INSTALL_DIR}
95 )95 )
9696
97install(FILES libqtdee.pc97# PkgConfig file
98 DESTINATION lib/pkgconfig98set (PREFIX "${CMAKE_INSTALL_PREFIX}")
99set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
100
101configure_file (libqtdee.pc.in
102 ${CMAKE_CURRENT_BINARY_DIR}/libqtdee.pc @ONLY)
103
104install(FILES ${CMAKE_CURRENT_BINARY_DIR}/libqtdee.pc
105 DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig
99 )106 )
100107
101## QtDeeQml108## QtDeeQml
102109
=== renamed file 'libqtdee.pc' => 'libqtdee.pc.in'
--- libqtdee.pc 2011-02-21 16:42:32 +0000
+++ libqtdee.pc.in 2012-02-20 16:35:21 +0000
@@ -1,5 +1,5 @@
1prefix=/usr1prefix=@PREFIX@
2exec_prefix=/usr2exec_prefix=@EXEC_PREFIX@
3libdir=${exec_prefix}/lib3libdir=${exec_prefix}/lib
4includedir=${prefix}/include4includedir=${prefix}/include
55
@@ -7,6 +7,6 @@
7Description: Qt binding and QML plugin for Dee.7Description: Qt binding and QML plugin for Dee.
8Version: 0.28Version: 0.2
99
10Requires: QtCore QtDBus QtDeclarative10Requires: QtCore QtDBus QtDeclarative dee-1.0
11Libs: -L${libdir} -lQtDee11Libs: -L${libdir} -lQtDee
12Cflags: -I${includedir}/QtDee12Cflags: -I${includedir}/QtDee

Subscribers

People subscribed via source and target branches